Merge branch 'linus' into cbus
authorTony Lindgren <tony@atomide.com>
Mon, 6 Aug 2012 08:53:12 +0000 (01:53 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 Aug 2012 08:53:12 +0000 (01:53 -0700)

Trivial merge