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)
Freescale updates for 3.6

1  2 
arch/powerpc/kernel/head_fsl_booke.S
arch/powerpc/platforms/85xx/p1022_ds.c

Simple merge