Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Fri, 17 Aug 2012 08:17:03 +0000 (01:17 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Aug 2012 08:17:03 +0000 (01:17 -0700)

Trivial merge