]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'scott/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 23 Mar 2014 23:26:10 +0000 (10:26 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 23 Mar 2014 23:26:10 +0000 (10:26 +1100)
Freescale updates from Scott. Mostly support for critical
and machine check exceptions on 64-bit BookE, some new
PCI suspend/resume work and misc bits.

1  2 
arch/powerpc/include/asm/reg.h

Simple merge