r Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216086897 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216086897 +1000

Merge commit 'jwb/jwb-next'
,Pd