Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2009 01:18:21 +0000 (18:18 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2009 01:18:21 +0000 (18:18 -0700)
Merge branch 'for-next' into tmp-rebuild-1255655897


Trivial merge