Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:12:36 +0000 (09:12 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:12:36 +0000 (09:12 -0700)

Trivial merge