Merge branch 'linus'
authorTony Lindgren <tony@atomide.com>
Wed, 30 Jan 2013 22:28:16 +0000 (14:28 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Jan 2013 22:28:16 +0000 (14:28 -0800)

Trivial merge