summaryrefslogtreecommitdiff
path: root/sound/oss/v_midi.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-06 16:21:04 +0400
committerJames Morris <jmorris@namei.org>2010-05-06 16:21:04 +0400
commit043b4d40f53131c5f72eca2a46555fe35328a930 (patch)
tree02a40eeb688f7ed9730e26a22f39ad7e04378de2 /sound/oss/v_midi.h
parent292823814261e085cdcef06b6b691e6c2563fbd4 (diff)
parent722154e4cacf015161efe60009ae9be23d492296 (diff)
downloadlinux-043b4d40f53131c5f72eca2a46555fe35328a930.tar.xz
Merge branch 'master' into next
Conflicts: security/keys/keyring.c Resolved conflict with whitespace fix in find_keyring_by_name() Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'sound/oss/v_midi.h')
0 files changed, 0 insertions, 0 deletions