Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Dec 2013 04:19:31 +0000 (15:19 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Dec 2013 04:19:31 +0000 (15:19 +1100)
commitdece8ada993e1764a115bdff0f1effffaa5fc8dc
treeba35b26bce046c3062bf13b2fd7611cf9265e66e
parenta68c33f3592eef63304a5f5ab68466539ccac56c
parentf991db1cf1bdca43675b5d2df0af991719727029
Merge branch 'merge' into next

Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/exception-64s.h
arch/powerpc/include/asm/opal.h
arch/powerpc/kernel/misc_64.S
arch/powerpc/kernel/smp.c
arch/powerpc/platforms/powernv/eeh-ioda.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.h