Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:37:49 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:37:49 +0000 (11:37 +1000)

Trivial merge