Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Thu, 23 Aug 2012 16:08:26 +0000 (09:08 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 23 Aug 2012 16:08:26 +0000 (09:08 -0700)

Trivial merge