Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ...

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-10-28 09:44:56 -07:00

..

blizzard.h

omap: Checkpatch cleanup for blizzard.h

2010-03-11 14:50:00 -08:00

board-ams-delta.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board-sx1.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board-voiceblue.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board.h

omap: Move omap2 FS USB platform init code into mach-omap2/usb-fs.c

2010-07-05 16:31:29 +03:00

clkdev_omap.h

OMAP3 clock: reorganize CK_* platform flags

2010-01-26 20:12:56 -07:00

clkdev.h

omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2

2009-10-19 17:32:58 -07:00

clock.h

OMAP: clock: add kerneldoc for structures; move flags closer to structs

2010-07-26 16:34:27 -06:00

clockdomain.h

OMAP clockdomain/powerdomain: improve documentation

2010-01-26 20:13:02 -07:00

common.h

OMAP2: UART: remove set_uart_globals

2010-09-29 12:42:57 -07:00

cpu.h

omap2/3: Update revision identification

2010-10-01 16:35:24 -07:00

display.h

OMAP: DSS2: Use dss_features framework on DSS2 code

2010-10-22 23:21:04 +03:00

dma-44xx.h

omap4: Add auto-generated irq and dma headers

2010-02-23 14:02:52 -08:00

dma.h

OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish

2010-10-11 14:18:56 -07:00

dmtimer.h

OMAP: mach-omap2: Fix static declaration warnings

2010-10-08 09:57:40 -07:00

dsp.h

omap: add dsp platform device

2010-10-05 12:05:11 -07:00

flash.h

omap: convert boards to use physmap-flash

2010-02-15 10:03:32 -08:00

fpga.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

gpio-switch.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

gpio.h

OMAP2/3: GPIO: generalize prepare for idle

2010-05-12 09:39:16 -07:00

gpmc-smc91x.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

gpmc-smsc911x.h

ARM: OMAP3LOGIC: Add generic smsc911x support when connected to GPMC

2010-09-28 11:39:18 -07:00

gpmc.h

omap3 nand: cleanup virtual address usages

2010-08-02 15:30:38 +03:00

hardware.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

hwa742.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

i2c.h

omap: i2c: Avoid compilation error in case the header is included multiple times

2010-09-27 10:15:25 -07:00

io.h

omap3/4: Remove overlapping mapping of L4_WKUP io space

2010-02-23 10:57:41 -08:00

iommu2.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

iommu.h

omap iommu: add functionality to get TLB miss interrupt

2010-06-29 07:55:07 +03:00

iovmm.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

irda.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

irqs-44xx.h

omap4: Add auto-generated irq and dma headers

2010-02-23 14:02:52 -08:00

irqs.h

OMAP2/3: UART: add omap_hwmod data for UARTs 1-4

2010-09-29 12:42:42 -07:00

keypad.h

Merge branch '7xx-iosplit-plat' with omap-fixes

2009-11-10 18:10:34 -08:00

lcd_mipid.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

led.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

mailbox.h

omap: mailbox: reorganize headers

2010-08-04 15:50:20 +03:00

mcbsp.h

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-10-25 13:46:56 -07:00

mcspi.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

memory.h

omap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS

2010-02-15 09:27:04 -08:00

menelaus.h

omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2

2010-02-15 09:27:01 -08:00

mmc.h

Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus

2010-10-08 10:19:53 -07:00

multi.h

omap2/3/4: Fix multi.h when omap3 and omap4 are selected without omap2

2010-05-03 17:21:31 -07:00

mux.h

Merge branch 'devel-misc' into omap-for-linus

2010-08-02 14:23:38 +03:00

nand.h

omap3 nand: cleanup virtual address usages

2010-08-02 15:30:38 +03:00

nokia-dsi-panel.h

OMAP: DSS2: Add Nokia DSI command mode panel configuration struct

2010-08-03 15:18:48 +03:00

omap4-keypad.h

Input: omap4-keypad - use platform device helpers

2010-10-13 07:49:25 -07:00

omap7xx.h

omap1: Add 7xx clocks and pin muxes for SPI

2010-01-08 10:29:05 -08:00

omap16xx.h

omap: Clean the serial port defines

2010-02-15 08:48:53 -08:00

omap24xx.h

OMAP2420: CTRL: fix OMAP242X_CTRL_REGADDR macro

2010-10-08 11:40:17 -06:00

omap34xx.h

crypto: omap - Updates omap sham device related platform code

2010-05-03 11:10:03 +08:00

omap44xx.h

OMAP4: PRM: Remove MPU internal code name and apply PRCM naming convention

2010-05-20 12:31:11 -06:00

omap730.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap850.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap1510.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap_device.h

OMAP: omap_device: make all devices a child of a new parent device

2010-09-23 17:14:14 -07:00

omap_hwmod.h

omap: hwmod: Handle modules with 16bit registers

2010-10-08 10:23:22 -07:00

omap-alsa.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

omap-pm.h

OMAP: PM constraints: add omap_pm_set_min_clk_rate()

2010-07-26 16:34:34 -06:00

omap-serial.h

OMAP: control: move plat-omap/control.h to mach-omap2/control.h

2010-10-08 11:40:20 -06:00

onenand.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

param.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

powerdomain.h

OMAP2plus: Fix static function warnings

2010-10-08 10:02:49 -07:00

prcm.h

OMAP4: prcm: Add temporarily helper functions for rmw and read inside the PRM

2010-09-21 15:11:42 -06:00

sdrc.h

OMAP: mach-omap2: Fix static declaration warnings

2010-10-08 09:57:40 -07:00

serial.h

omap2/3: Fix DEBUG_LL for omap zoom2/3

2010-05-03 17:53:08 -07:00

smp.h

ARM: Provide common header for hard_smp_processor_id()

2010-10-04 20:20:45 +01:00

sram.h

OMAP: plat-omap: Fix static function warnings

2010-10-08 10:12:38 -07:00

system.h

omap: pass the reboot command to the boot loader

2010-03-11 14:50:00 -08:00

tc.h

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

timex.h

omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2

2009-10-19 17:32:58 -07:00

uncompress.h

omap3: Add minimal OMAP3 IGEP module support

2010-10-08 10:22:11 -07:00

usb.h

Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

2010-10-25 13:46:56 -07:00

vram.h

ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB

2010-07-27 08:48:23 +01:00

vrfb.h

OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB

2010-10-22 23:21:06 +03:00