Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 13 Nov 2009 00:23:19 +0000 (16:23 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 13 Nov 2009 00:23:19 +0000 (16:23 -0800)
Merge branch 'for-next' into tmp-rebuild-1258071714


Trivial merge