]> 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: 83cbb80 dab224f)
Merge omap-drivers
authorTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2007 12:52:03 +0000 (04:52 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 1 Mar 2007 12:52:03 +0000 (04:52 -0800)
commit5d08b17a3d3b1c916729cb90725c7a915cb9044f
tree1d568e6ace95fccf5339ed364f9e1d30473b340atree | snapshot
parent83cbb808d8c9733e634f80b3f335cc78a92963cdcommit | diff
parentdab224f49fec696f3b5837fa39f6ed01c8d153d3commit | 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.