summaryrefslogtreecommitdiffstats
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 23:38:53 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 23:38:53 +0100
commit8cea4eb642890a1de58980e7e1617d1765ef8f7c (patch)
treeea43bc34715d854c599743bf226437339bed1beb /kernel/panic.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)
downloadlinux-8cea4eb642890a1de58980e7e1617d1765ef8f7c.tar.xz
linux-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 'kernel/panic.c')
0 files changed, 0 insertions, 0 deletions