Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 19 Oct 2009 23:05:48 +0000 (16:05 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 19 Oct 2009 23:05:48 +0000 (16:05 -0700)
Merge branch 'for-next' into tmp-rebuild-1255993547


Trivial merge