Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Jun 2011 09:41:00 +0000 (02:41 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Jun 2011 09:41:00 +0000 (02:41 -0700)

Trivial merge