Merge remote-tracking branch 'sh-current/sh-fixes-for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:26:00 +0000 (11:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:26:00 +0000 (11:26 +1000)

Trivial merge