]>
www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/boot/compressed/head-omap.S
Merge omap-drivers
Conflicts:
arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dsp/dsp_common.c
arch/arm/plat-omap/mailbox.c
drivers/Makefile
drivers/cbus/Kconfig
drivers/cbus/retu-pwrbutton.c
drivers/cbus/tahvo-usb.c
drivers/video/omap/Kconfig
drivers/video/omap/sossi.c
include/asm-arm/arch-omap/mailbox.h
projects / linux-2.6-omap-h63xx.git / commit