]> 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: 9970590 0ff6954)
Merge omap-drivers
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2007 12:27:36 +0000 (04:27 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2007 12:27:36 +0000 (04:27 -0800)
commitd76dea821270ce5d5ab1187776a2ba61d6c6fe23
treed3c316c4736a33cf59da58f40d14ada879f6825ftree | snapshot
parent997059003ce31a1c611e2db9b8a56cabf6bbc330commit | diff
parent0ff695423d92b736685c0e5ac647a55e6217deeccommit | diff
Merge omap-drivers

Conflicts:

drivers/Makefile
drivers/cbus/Kconfig
drivers/cbus/retu-pwrbutton.c
drivers/cbus/tahvo-usb.c
drivers/video/omap/Kconfig
drivers/video/omap/blizzard.c
drivers/video/omap/dispc.c
drivers/video/omap/omapfb_main.c
drivers/video/omap/rfbi.c
drivers/video/omap/sossi.c
arch/arm/plat-omap/clock.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.