]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
arch/arm/plat-omap/clock.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/plat-omap/clock.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.