summaryrefslogtreecommitdiff
path: root/sound/aoa
diff options
context:
space:
mode:
authorVolodymyr Bendiuga <volodymyr.bendiuga@gmail.com>2017-02-14 11:29:30 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-14 11:45:28 -0500
commit91eaa475e287e7cf87959d68fb273e4f092897f4 (patch)
tree707117396d7a9139425bc39a02b536d15f50c8d0 /sound/aoa
parentd7cf52c249d7aa797ea27808e1526604309ec142 (diff)
net:dsa:mv88e6xxx: use watchdog ops for 6097 chip
mv88e6097 chip requires watchdog_ops to be set. Signed-off-by: Volodymyr Bendiuga <volodymyr.bendiuga@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/aoa')
0 files changed, 0 insertions, 0 deletions
mp;id2=678b5c6b22fed89a13d5b2267f423069a9b11c80'>diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes the following issues: - Fix pointer size when caam is used with AArch64 boot loader on AArch32 kernel. - Fix ahash state corruption in marvell driver. - Fix buggy algif_aed tag handling. - Prevent mcryptd from being used with incompatible algorithms which can cause crashes" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - fix uninitialized variable warning crypto: mcryptd - Check mcryptd algorithm compatibility crypto: algif_aead - fix AEAD tag memory handling crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash crypto: marvell - Don't copy hash operation twice into the SRAM
Diffstat (limited to 'include/uapi/sound/emu10k1.h')