summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-27 10:09:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-27 10:09:22 -0700
commit0c6b5c5b45c258e4aca65df8c5746838668fd99f (patch)
tree89e976bc2848f2702e2ae7f4d2c264668cb4e4d8 /drivers/irqchip/Makefile
parent6dec97dc92946eb479e6ebb54a61f8226cceefec (diff)
parentd220980b701d838560a70de691b53be007e99e78 (diff)
downloadlinux-0c6b5c5b45c258e4aca65df8c5746838668fd99f.tar.bz2
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt: "Here are 3 bug fixes that should probably go into 3.11 since I'm also tagging them for stable. Once fixes our old /proc/powerpc/lparcfg file which provides partition informations when running under our hypervisor and also acts as a user-triggerable Oops when hot :-( The other two respectively are a one liner to fix a HVSI protocol handshake problem causing the console to fail to show up on a bunch of machines until we reach userspace, which I deem annoying enough to warrant going to stable, and a nasty gcc miscompile causing us to pass virtual instead of physical addresses to the firmware under some circumstances" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/hvsi: Increase handshake timeout from 200ms to 400ms. powerpc: Work around gcc miscompilation of __pa() on 64-bit powerpc: Don't Oops when accessing /proc/powerpc/lparcfg without hypervisor
Diffstat (limited to 'drivers/irqchip/Makefile')
0 files changed, 0 insertions, 0 deletions