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	omap: use smc91x_platdata to setup smc91x	2009-12-11 16:16:33 -08:00
debug-leds.c	Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS	2010-07-05 17:03:58 +03:00
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	OMAP: PM constraints: add return values; add requesting device param to omap_pm_set_max_dev_wakeup_lat()	2010-07-26 16:34:34 -06:00
io.c	Merge with mainline to remove plat-omap/Kconfig conflict	2010-03-01 14:19:05 -08:00
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	omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr	2010-06-29 07:55:05 +03:00
iovmm.c	omap iommu: Fix Memory leak	2010-06-09 13:21:27 +03:00
mailbox.c	omap: mailbox: reorganize headers	2010-08-04 15:50:20 +03:00
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	omap: mux: Remove old mux code	2010-07-05 16:31:40 +03:00
ocpi.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
omap-pm-noop.c	OMAP: PM constraints: add omap_pm_set_min_clk_rate()	2010-07-26 16:34:34 -06:00
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	omap: Move omap1 USB platform init code into mach-omap1/usb.c	2010-07-05 16:31:30 +03:00