Merge branch 'linus' into fix-cbus-mismerge
authorTony Lindgren <tony@atomide.com>
Mon, 6 Jun 2011 11:30:30 +0000 (04:30 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 Jun 2011 11:30:30 +0000 (04:30 -0700)

Trivial merge