Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:29:12 +0000 (23:29 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Apr 2011 06:29:12 +0000 (23:29 -0700)

Trivial merge