Merge for-next
authorTony Lindgren <tony@atomide.com>
Sun, 22 Nov 2009 18:51:34 +0000 (10:51 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 22 Nov 2009 18:51:34 +0000 (10:51 -0800)
Merge branch 'for-next' into tmp-rebuild-1258915893


Trivial merge