Merge commit 'jk/jk-merge'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Jul 2008 05:35:10 +0000 (15:35 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Jul 2008 05:35:10 +0000 (15:35 +1000)
commite9f76354ce83a20c7768ad37caa033f6506b4f96
tree6be6785c4479c991bfe899ce2daf7fe5a15753ec
parentc174aff95642bcc830102becb9802adeb8f87a5a
parentad1ede127760d6ca4903f44dfe1a8a38b3bfb36c
Merge commit 'jk/jk-merge'