Merge commit 'jk/jk-merge'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 10 Oct 2008 04:56:16 +0000 (15:56 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 10 Oct 2008 04:56:16 +0000 (15:56 +1100)
commitbb3d55e2505d8de15b132a3f6a1d596c1e2a13ee
tree992c2c2c1b49a6e22a47cdb262ea55316684ad52
parent8f64e1f2d1e09267ac926e15090fd505c1c0cbcb
parent6747c2ee8abf749e63fee8cd01a9ee293e6a4247
Merge commit 'jk/jk-merge'