Merge for-next
authorTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 01:55:28 +0000 (17:55 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 01:55:28 +0000 (17:55 -0800)
Merge branch 'for-next' into tmp-rebuild-1258163727


Trivial merge