summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 04:44:28 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-02 04:44:28 +0300
commit45c680b9949ecdb829a331100ae49926bf82899c (patch)
tree21b8267a41fa49423657726b56f314fa8c6b6506 /include/media
parent851328feb8c1d4130d3a0acb004e474168702d6d (diff)
parent225f58fbcc02ace232fc49f05036042f9d58263e (diff)
downloadlinux-45c680b9949ecdb829a331100ae49926bf82899c.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fix from Jiri Kosina: "Livepatching error handling fix" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: Improve error handling in klp_disable_func()
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions