]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 10 Oct 2008 08:20:57 +0000 (11:20 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Oct 2008 08:20:57 +0000 (11:20 +0300)
Merge branches 'master' and 'linus'

1  2 
Makefile

diff --cc Makefile
Simple merge