Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 25 Jun 2008 11:13:30 +0000 (14:13 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 25 Jun 2008 11:13:30 +0000 (14:13 +0300)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS
Makefile

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