]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b646f8 2ffc83a)
Merge omap-drivers
authorTony Lindgren <tony@atomide.com>
Fri, 2 Mar 2007 10:04:11 +0000 (02:04 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Mar 2007 10:04:11 +0000 (02:04 -0800)
commitc2df9c97f82c1035ef5a696ed0ff5bc93ae01d71
treef8e275ca4f808efe0d2f39f883cce7637bd55072tree | snapshot
parent2b646f85c30f70c2694cbb68207828e634ac2d6ecommit | diff
parent2ffc83a98dea9d6b3e3f9c71f4259b37357ede94commit | diff
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/Kconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.