Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 2 Apr 2008 07:15:49 +0000 (10:15 +0300)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS
Makefile

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