Merge commit 'jwb/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 Jan 2010 05:52:27 +0000 (16:52 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 Jan 2010 05:52:27 +0000 (16:52 +1100)
commite90c52e03b07a77675aa1584141846d3c221ea67
tree8532f049e43c2ab8436f9d78d3be91d3bbaec5ca
parentd234b3c36ff600b2a51cff74c9263cba5b2c24ee
parent02ea22896a66026f70ecee43527b15f9ca21b116
Merge commit 'jwb/merge' into merge