Merge commit 'gcl/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 15 Jan 2010 02:40:17 +0000 (13:40 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 15 Jan 2010 02:40:17 +0000 (13:40 +1100)
commit78924577f493c6fa62e2b38356faa542fa7583e6
tree14a3e49dcf36536fe793d0e4526e22c97b37606f
parent291f8de2c632789bc4af9655fcd6f4f7f23c06aa
parent3f884bf54dde417e963a0e6effb8f2c01f95abee
Merge commit 'gcl/merge' into merge