aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth/cmtp/capi.c
diff options
context:
space:
mode:
authorLinus Torvalds2013-01-28 11:53:49 -0800
committerLinus Torvalds2013-01-28 11:53:49 -0800
commit45e72af09faa7dad5d8539ebac0fe317ae88318b (patch)
tree30699550096e312bceeb584bfda1325d4430db86 /net/bluetooth/cmtp/capi.c
parentae2c3d95faa4f75005f52051734464d4e8991612 (diff)
parentd4e0bfec9b6fbb9b58640b44e01bb74ae0d29b22 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fix from Steven Whitehouse. * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: fix skip unlock condition
Diffstat (limited to 'net/bluetooth/cmtp/capi.c')
0 files changed, 0 insertions, 0 deletions