Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)
commit0526484aa345adbf790d1201a6f5d09be0a648a3
tree8da37ac2858a960e80dc59ebc4afc460935724f4
parente0ea8b2c0677e6cc44a0e5b867be48867f91de5b
parentaa021baa3295fa6e3f367d80f8955dd5176656eb
Merge commit 'origin/master' into next
arch/powerpc/kernel/time.c
arch/powerpc/platforms/pseries/xics.c