summaryrefslogtreecommitdiffstats
path: root/sound/core/sgbuf.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-28 11:15:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-28 11:15:57 -0700
commit282695802957b069d293a9f8773a14399093bd6f (patch)
treec362f39413243fb3f153104afa81028dad497b07 /sound/core/sgbuf.c
parent4efdedca932658cc54866ee19001af3cbffa3769 (diff)
parentb6dd6f4738837439c520e73995ec93fe1de2ec72 (diff)
downloadlinux-282695802957b069d293a9f8773a14399093bd6f.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro: "Oh, well... Still nothing useful on that livelock (I had something that looked kinda-sorta like a non-invasive solution, but it deadlocks), so it's just Miklos' vmsplice fix for now" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: fix vmplice_to_user()
Diffstat (limited to 'sound/core/sgbuf.c')
0 files changed, 0 insertions, 0 deletions