summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 18:01:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 18:01:45 -0700
commitae75d84f3e29a1832b35cd342ac471bbf30bce4c (patch)
tree930825162814ee91e8fa52a871d9b80c5951d6da /drivers/crypto
parent0b52a3c89c8f44d7a936da8b374789dc0f43b188 (diff)
parentb11ae95100f7061b39a15e5c1ecbf862464ac4b4 (diff)
downloadlinux-3.10-ae75d84f3e29a1832b35cd342ac471bbf30bce4c.tar.gz
linux-3.10-ae75d84f3e29a1832b35cd342ac471bbf30bce4c.tar.bz2
linux-3.10-ae75d84f3e29a1832b35cd342ac471bbf30bce4c.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "This is purely regressions (though not all recent ones) or stable material" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Partial revert of "Context switch more PMU related SPRs" powerpc/perf: Fix deadlock caused by calling printk() in PMU exception powerpc/hw_breakpoints: Add DABRX cpu feature to fix 32-bit regression powerpc/power8: Update denormalization handler powerpc/pseries: Simplify denormalization handler powerpc/power8: Fix oprofile and perf powerpc/eeh: Don't check RTAS token to get PE addr powerpc/pci: Check the bus address instead of resource address in pcibios_fixup_resources
Diffstat (limited to 'drivers/crypto')
0 files changed, 0 insertions, 0 deletions