summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 18:58:38 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 18:58:38 +0200
commite9c0f1529c9022afbab16a442382aa9a84a79c41 (patch)
tree173e99d46283f5d814bf4407728ad0d2ea702100 /net/bluetooth/mgmt.c
parentvfs: fix d_ancestor() case in d_materialize_unique (diff)
parent9p: statfs should not override server f_type (diff)
downloadlinux-e9c0f1529c9022afbab16a442382aa9a84a79c41.tar.xz
linux-e9c0f1529c9022afbab16a442382aa9a84a79c41.zip
Merge tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p changes for the 3.4 merge window from Eric Van Hensbergen. * tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: statfs should not override server f_type net/9p: handle flushed Tclunk/Tremove net/9p: don't allow Tflush to be interrupted
Diffstat (limited to 'net/bluetooth/mgmt.c')
0 files changed, 0 insertions, 0 deletions