Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 24 Jan 2008 23:50:05 +0000 (15:50 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 24 Jan 2008 23:50:05 +0000 (15:50 -0800)
Merge branches 'master' and 'linus'

1  2 
Makefile

diff --cc Makefile
Simple merge