summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-08 21:48:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-08 21:48:26 -0700
commitb72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3 (patch)
treeac9ae8efb9109a17e3633409aaa245100f97c425 /drivers
parentba0fc709e197415aadd46b9ec208dc4abaa21edd (diff)
parent18c6ac383f3e46cfce08d0bf972705852a4e1268 (diff)
downloadkernel-crypto-b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3.tar.gz
kernel-crypto-b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3.tar.xz
kernel-crypto-b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions