Merge commit 'v3.2-rc2' into cbus
authorTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2011 23:52:41 +0000 (15:52 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2011 23:52:41 +0000 (15:52 -0800)

Trivial merge