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
..
include/plat	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
Kconfig	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
Makefile	OMAP: split plat-omap/common.c	2010-10-08 11:40:19 -06:00
clock.c	OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks	2010-10-08 11:40:20 -06:00
common.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
counter_32k.c	OMAP: split plat-omap/common.c	2010-10-08 11:40:19 -06:00
cpu-omap.c	OMAP: plat-omap: Fix static function warnings	2010-10-08 10:12:38 -07:00
debug-devices.c	…
debug-leds.c	…
devices.c	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
dma.c	OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish	2010-10-11 14:18:56 -07:00
dmtimer.c	omap4: Fix bootup crash observed with higher CPU clocks	2010-09-24 11:30:19 +05:30
fb.c	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-10-26 10:02:39 -07:00
fb.h	OMAP: plat-omap: Fix static function warnings	2010-10-08 10:12:38 -07:00
gpio.c	omap2: fix assorted compiler warnings	2010-09-23 18:27:18 -07:00
i2c.c	…
io.c	…
iommu-debug.c	arm/omap: use generic_file_llseek in iommu_debug	2010-09-16 10:33:11 +02:00
iommu.c	omap: iommu-load cam register before flushing the entry	2010-10-05 10:22:13 -07:00
iopgtable.h	…
iovmm.c	…
mailbox.c	…
mcbsp.c	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
mux.c	…
ocpi.c	…
omap-pm-noop.c	…
omap_device.c	Merge branch 'misc_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus	2010-09-27 10:18:00 -07:00
sram.c	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
sram.h	OMAP: plat-omap: Fix static function warnings	2010-10-08 10:12:38 -07:00
usb.c	…