Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:47:55 +0000 (19:47 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 02:47:55 +0000 (19:47 -0700)

Trivial merge