summaryrefslogtreecommitdiffstats
path: root/fs/dlm/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 02:43:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 02:43:04 +0200
commit31583d6acf940d2951bc8716557b06d9de5a0c4b (patch)
tree607aef385b0998f0cb7ff63b05407afed5182840 /fs/dlm/dir.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff)
parentFix kernel-doc parameter name typo in blk-settings.c: (diff)
downloadlinux-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.xz
linux-31583d6acf940d2951bc8716557b06d9de5a0c4b.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Fix kernel-doc parameter name typo in blk-settings.c: block: rename CONFIG_LBD to CONFIG_LBDAF block: Fix bounce_pfn setting hd: stop defining MAJOR_NR
Diffstat (limited to 'fs/dlm/dir.c')
0 files changed, 0 insertions, 0 deletions