Tony Lindgren 46cddc01aa Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers ... Conflicts: arch/arm/mach-omap1/devices.c arch/arm/mach-omap2/omap_hwmod_33xx_data.c arch/arm/mach-omap2/omap_hwmod_3xxx_data.c drivers/mmc/host/omap.c		2012-10-17 11:13:42 -07:00
..
include/mach	ARM: OMAP1: Move irda.h from plat to mach	2012-09-20 15:03:58 -07:00
ams-delta-fiq-handler.S	ARM: OMAP1: Move board-ams-delta.h from plat to mach	2012-09-20 15:02:19 -07:00
ams-delta-fiq.c	ARM: OMAP1: Move board-ams-delta.h from plat to mach	2012-09-20 15:02:19 -07:00
board-ams-delta.c	ARM: OMAP1: Move board-ams-delta.h from plat to mach	2012-09-20 15:02:19 -07:00
board-fsample.c	ARM: OMAP1: Move flash.h from plat to mach	2012-09-20 15:02:47 -07:00
board-generic.c	ARM: OMAP1: Make plat/mux.h omap1 only	2012-09-20 14:54:57 -07:00
board-h2-mmc.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-h2.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-h2.h	ARM: OMAP: No need to include board-h2.h from hardware.h	2009-03-23 18:07:33 -07:00
board-h3-mmc.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-h3.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-h3.h	ARM: OMAP: No need to include board-h3.h from hardware.h	2009-03-23 18:07:33 -07:00
board-htcherald.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-innovator.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-nand.c	ARM: OMAP1: board files: deduplicate and clean some NAND-related code	2012-04-13 06:34:31 -06:00
board-nokia770.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-osk.c	ARM: soc: driver specific changes	2012-10-01 18:46:13 -07:00
board-palmte.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-palmtt.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-palmz71.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-perseus2.c	ARM: OMAP1: Move flash.h from plat to mach	2012-09-20 15:02:47 -07:00
board-sx1-mmc.c	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
board-sx1.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
board-voiceblue.c	ARM: OMAP1: Move flash.h from plat to mach	2012-09-20 15:02:47 -07:00
clock_data.c	These fixes are needed to fix non-omap build breakage for	2012-09-23 17:15:44 -06:00
clock.c	ARM: OMAP: unwrap strings	2012-09-12 02:57:10 -06:00
clock.h	ARM: OMAP1: Move dpll1 rates selection from config to runtime	2011-12-08 18:02:23 -08:00
common.h	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
devices.c	Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers	2012-10-17 11:13:42 -07:00
dma.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
dma.h	ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1	2012-10-15 14:01:01 -07:00
flash.c	ARM: OMAP1: Move flash.h from plat to mach	2012-09-20 15:02:47 -07:00
fpga.c	ARM: OMAP2+: declare file-local functions as static	2012-04-13 06:34:26 -06:00
gpio7xx.c	ARM: OMAP: Move gpio.h to include/linux/platform_data	2012-09-12 18:06:30 -07:00
gpio15xx.c	ARM: OMAP: Move gpio.h to include/linux/platform_data	2012-09-12 18:06:30 -07:00
gpio16xx.c	ARM: OMAP: Move gpio.h to include/linux/platform_data	2012-09-12 18:06:30 -07:00
i2c.c	ARM: OMAP1: Make plat/mux.h omap1 only	2012-09-20 14:54:57 -07:00
id.c	ARM: OMAP: add includes for missing prototypes	2012-04-13 06:34:26 -06:00
io.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
iomap.h	ARM: create a common IOMEM definition	2012-03-13 21:22:09 -05:00
irq.c	ARM: OMAP: add includes for missing prototypes	2012-04-13 06:34:26 -06:00
Kconfig	ARM: config: sort select statements alphanumerically	2012-10-13 17:11:28 +01:00
lcd_dma.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
mailbox.c	arm: fix implicit module.h users by adding it to arch/arm as required.	2011-10-31 19:30:50 -04:00
Makefile	ARM: mach-omap1: retire custom LED code	2012-08-01 11:22:13 +08:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mcbsp.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
mmc.h	ARM: OMAP: Split plat/mmc.h into local headers and platform_data	2012-10-15 12:09:43 -07:00
mux.c	ARM: OMAP1: Make plat/mux.h omap1 only	2012-09-20 14:54:57 -07:00
ocpi.c	ARM: OMAP1: OCPI: move to mach-omap1/	2012-04-13 06:34:27 -06:00
opp_data.c	ARM: OMAP1: Move dpll1 rates selection from config to runtime	2011-12-08 18:02:23 -08:00
opp.h	ARM: OMAP1: Move dpll1 rates selection from config to runtime	2011-12-08 18:02:23 -08:00
pm_bus.c	PM: Move clock-related definitions and headers to separate file	2011-08-25 15:34:19 +02:00
pm.c	ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.h	2012-10-15 14:04:53 -07:00
pm.h	ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM	2011-02-04 14:26:08 +00:00
reset.c	ARM: OMAP: add includes for missing prototypes	2012-04-13 06:34:26 -06:00
serial.c	ARM: OMAP1: Make plat/mux.h omap1 only	2012-09-20 14:54:57 -07:00
sleep.S	ARM: OMAP: Remove remaining includes for mach/io.h	2012-03-06 21:34:38 -06:00
sram.S	ARM: OMAP: Remove remaining includes for mach/io.h	2012-03-06 21:34:38 -06:00
time.c	ARM: mach-omap1: retire custom LED code	2012-08-01 11:22:13 +08:00
timer32k.c	ARM: mach-omap1: retire custom LED code	2012-08-01 11:22:13 +08:00
timer.c	ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP	2012-09-23 17:28:27 -06:00
usb.c	ARM: OMAP1: Make plat/mux.h omap1 only	2012-09-20 14:54:57 -07:00