summaryrefslogtreecommitdiff
path: root/include/net/bluetooth/l2cap.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-26 03:16:34 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-26 03:16:34 +0400
commit0246544fc9abcc5850cfc4cfcfe6c16067541024 (patch)
treef9d5e8aa4fcdcae2a16429c97d739d12fa269091 /include/net/bluetooth/l2cap.h
parent82e13c71bc655b6dc7110da4e164079dadb44892 (diff)
parentd7afaec0b564f0609e116f562983b8e72fc3e9c9 (diff)
downloadlinux-0246544fc9abcc5850cfc4cfcfe6c16067541024.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse fixes from Miklos Szeredi: "These two pathes fix issues with the kernel-userspace protocol changes in v3.15" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT fuse: s_time_gran fix
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
0 files changed, 0 insertions, 0 deletions