]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 May 2008 17:04:54 +0000 (10:04 -0700)
Merge branches 'master' and 'linus'

1  2 
Makefile
drivers/net/Kconfig

diff --cc Makefile
Simple merge
Simple merge