Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:46:35 +0000 (17:46 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:46:35 +0000 (17:46 -0800)
Merge branch 'for-next' into tmp-rebuild-1260323192


Trivial merge