]> www.pilppa.org 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: de1121f 72d3105)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000 (17:26 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000 (17:26 +0300)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/plat-omap/devices.c

1  2 
Makefile patch | diff1 | diff2 | blob | history
drivers/media/video/Kconfig patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc drivers/media/video/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.