android_kernel_xiaomi_sm8350/arch/arm/plat-omap
Russell King 2502991560 Merge branch 'fixes' into for-linus
Conflicts:

	arch/arm/mach-versatile/core.c
2008-10-15 23:16:07 +01:00
..
include/mach Merge branch 'fixes' into for-linus 2008-10-15 23:16:07 +01:00
clock.c
common.c Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
cpu-omap.c
debug-devices.c
debug-leds.c
devices.c Merge branch 'fixes' into for-linus 2008-10-15 23:16:07 +01:00
dma.c
dmtimer.c Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
fb.c
gpio.c Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
i2c.c
io.c
Kconfig
mailbox.c
mailbox.h
Makefile
mcbsp.c
mux.c
ocpi.c
sram.c Merge branch 'omap-all' into devel 2008-10-14 22:24:42 +01:00
usb.c