]>
www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit - drivers/bluetooth/hci_h4p/fw-ti.c
Merge omap-drivers
Conflicts:
arch/arm/configs/omap_h2_1610_defconfig
arch/arm/configs/omap_osk_5912_defconfig
arch/arm/mach-omap1/Makefile
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/dsp/Kconfig
arch/arm/plat-omap/dsp/dsp_common.c
arch/arm/plat-omap/dsp/dsp_common.h
arch/arm/plat-omap/dsp/omap1_dsp.h
arch/arm/plat-omap/mailbox.c
drivers/Makefile
drivers/spi/Makefile
drivers/spi/omap2_mcspi.c
include/asm-arm/arch-omap/dsp.h
include/asm-arm/arch-omap/mailbox.h
projects / linux-2.6-omap-h63xx.git / commit