Arnd Bergmann 3e965b1763 Merge branch 'next/fixes' into next/cleanup ... Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c		2011-10-31 23:25:41 +01:00
..
include/mach	ARM: OMAP: move OMAP1 memory config from plat/memory.h to its mach/memory.h	2011-09-26 10:12:02 -04:00
ams-delta-fiq-handler.S
ams-delta-fiq.c
board-ams-delta.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-fsample.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-generic.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-h2-mmc.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
board-h2.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-h2.h
board-h3-mmc.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
board-h3.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-h3.h
board-htcherald.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-innovator.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-nokia770.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-osk.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-palmte.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-palmtt.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-palmz71.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-perseus2.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-sx1-mmc.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
board-sx1.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
board-voiceblue.c	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
clock_data.c
clock.c
clock.h
devices.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
dma.c	arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del	2011-06-01 02:25:04 -07:00
flash.c
fpga.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
gpio7xx.c	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-07-22 14:50:57 -07:00
gpio15xx.c	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-07-22 14:50:57 -07:00
gpio16xx.c	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-07-22 14:50:57 -07:00
i2c.c
id.c
io.c	ARM: omap: Setup consistent dma size at boot time	2011-08-22 12:00:10 +00:00
irq.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
Kconfig
lcd_dma.c
leds-h2p2-debug.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
leds-innovator.c
leds-osk.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
leds.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
leds.h
mailbox.c
Makefile	OMAP1: PM: register notifiers with generic clock ops even when !PM_RUNTIME	2011-06-14 05:53:18 -07:00
Makefile.boot
mcbsp.c	ARM: OMAP: mcbsp: Move address definitions to arch/arm/mach-omap1/mcbsp.c	2011-09-26 17:48:51 -07:00
mux.c
opp_data.c
opp.h
pm_bus.c	PM: Rename clock management functions	2011-07-02 14:29:57 +02:00
pm.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
pm.h
reset.c
serial.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
sleep.S
sram.S
time.c	omap: Set separate timer init functions to avoid cpu_is_omap tests	2011-06-20 01:25:39 -07:00
timer32k.c	omap2+: Reserve clocksource and timesource and initialize dmtimer later	2011-06-27 12:14:01 -07:00
usb.c