Merge remote-tracking branch 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 13 Jul 2012 03:38:26 +0000 (13:38 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 13 Jul 2012 03:38:26 +0000 (13:38 +1000)
commitaf3bf7fbe0148aadc8fedd6f5e5279cabef9ced5
tree25e3b1099ecf851bb7b5f6e6d3ffcdeb33de32f0
parent10db8d212864cb6741df7d7fafda5ab6661f6f88
parentb915341b4be29b3b2c02da932b69871e9b55ca4b
Merge remote-tracking branch 'kumar/next' into next

Freescale updates for 3.6
arch/powerpc/kernel/head_fsl_booke.S
arch/powerpc/platforms/85xx/p1022_ds.c