Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Thu, 15 Mar 2012 00:55:34 +0000 (17:55 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Mar 2012 00:55:34 +0000 (17:55 -0700)

Trivial merge