path: root/crypto
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 09:38:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 09:38:51 -0700
commit143418d0c87fda0c587205c45094d8b05222fd49 (patch)
tree31204467c0632c356cb77e374c270016f72d4ef3 /crypto
parentdeb74f5ca1f22f9e1c5da93143a250dbb96535af (diff)
parent9b218f63e50e590fe0c7724a0838d7eaa6dae5ce (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "This contains a couple more fixes for the system.h disintegration, a trivial section mismatch fix, a couple of patches from akpm that I didn't quite get he expected me to pickup, and a few more trivialities form Kumar that he appear to have forgotten to send me in the previous batch." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart powerpc/eeh: Remove eeh_event_handler()->daemonize() powerpc/kvm: Fallout from system.h disintegration powerpc: Fix fallout from system.h split up powerpc: Mark const init data with __initconst instead of __initdata powerpc/qe: Update the SNUM table for MPC8569 Rev2.0 powerpc/dts: Removed fsl,msi property from dts. powerpc/epapr: add "memory" as a clobber to all hypercalls powerpc/85xx: Enable I2C_CHARDEV and I2C_MPC options in defconfigs powerpc/85xx: add the P1020UTM-PC DTS support powerpc/85xx: add the P1020MBG-PC DTS support powerpc/8xxx: remove 85xx/86xx restrictions from fsl_guts.h
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions