]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 29 Dec 2008 08:51:06 +0000 (10:51 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 29 Dec 2008 08:51:06 +0000 (10:51 +0200)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS
Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge