aboutsummaryrefslogtreecommitdiffstats
path: root/net/lapb/lapb_in.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2010-03-13 22:38:53 +0000
committerLinus Torvalds <[email protected]>2010-03-13 22:38:53 +0000
commit8cea4eb642890a1de58980e7e1617d1765ef8f7c (patch)
treeea43bc34715d854c599743bf226437339bed1beb /net/lapb/lapb_in.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
parentGFS2: Skip check for mandatory locks when unlocking (diff)
downloadkernel-8cea4eb642890a1de58980e7e1617d1765ef8f7c.tar.gz
kernel-8cea4eb642890a1de58980e7e1617d1765ef8f7c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Skip check for mandatory locks when unlocking GFS2: Allow the number of committed revokes to temporarily be negative GFS2: do not select QUOTA
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions