summaryrefslogtreecommitdiffstats
path: root/sound/usb/helper.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-08 23:41:12 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-08 23:41:12 +0200
commitb5356a19ced273ef8a941be226f4dfdb95c23073 (patch)
tree65ff365e800c178655557eb1ea62a78a7601ff76 /sound/usb/helper.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentarm64: Enable interrupts before calling do_notify_resume() (diff)
downloadlinux-b5356a19ced273ef8a941be226f4dfdb95c23073.tar.xz
linux-b5356a19ced273ef8a941be226f4dfdb95c23073.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 changes from Catalin Marinas: "arm64 fixes: - Use swiotlb_init() instead of swiotlb_init_with_default_size(). The latter is now a static function (commit 74838b75379a "swiotlb: add the late swiotlb initialization function with iotlb memory"). - Enable interrupts before calling do_notify_resume(). arm64 clean-up: - Use the generic implementation of compat_sys_sendfile() on arm64 as commit 8f9c0119d7ba (introducing the function) has been merged." * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: Enable interrupts before calling do_notify_resume() arm64: Use the generic compat_sys_sendfile() implementation arm64: Call swiotlb_init() instead of swiotlb_init_with_default_size()
Diffstat (limited to 'sound/usb/helper.c')
0 files changed, 0 insertions, 0 deletions