Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Feb 2012 21:02:46 +0000 (13:02 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Feb 2012 21:02:46 +0000 (13:02 -0800)

Trivial merge