Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
include/plat	Merge branch 'samsung/driver' into next/drivers	2012-01-09 16:16:29 +00:00
clock.c	arm: Add export.h to ARM specific files as required.	2011-10-31 19:30:50 -04:00
common.c	ARM: 7192/1: OMAP: Fix build error for omap1_defconfig	2011-12-06 12:43:53 +00:00
counter_32k.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
cpu-omap.c
debug-devices.c
debug-leds.c
devices.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
dma.c
dmtimer.c	ARM: OMAP: dmtimer: Include linux/module.h	2011-11-04 17:41:06 -07:00
fb.c
fb.h
i2c.c	ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success	2011-11-04 17:41:07 -07:00
Kconfig	ARM: GIC: Make MULTI_IRQ_HANDLER mandatory	2011-11-15 18:14:02 +00: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: plat-omap: remove arch specific special handling for ioremap	2011-11-18 13:51:02 -05:00
mcbsp.c	ARM: OMAP: mcbsp: Start generalize signal muxing functions	2011-09-26 17:49:07 -07:00
mux.c
ocpi.c
omap_device.c	Merge branch 'fixes-modulesplit' into fixes	2011-11-07 12:27:23 -08:00
omap-pm-noop.c	ARM: OMAP: change get_context_loss_count ret value to int	2011-11-04 17:41:07 -07:00
sram.c	ARM: OMAP: Map SRAM later on with ioremap_exec()	2011-10-19 16:34:10 -07:00
sram.h
usb.c