Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 18 Nov 2009 00:01:08 +0000 (16:01 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 18 Nov 2009 00:01:08 +0000 (16:01 -0800)
Merge branch 'for-next' into tmp-rebuild-1258502467


Trivial merge