Merge commit 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Mon, 30 May 2011 14:45:45 +0000 (07:45 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 May 2011 14:45:45 +0000 (07:45 -0700)

Trivial merge