summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlmfs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 02:13:09 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 02:13:09 +0100
commitb87a2d3e3147bd140da2eae584772c353d11421b (patch)
treeb07334f4a0b6bef83be8f061e76694c267d5fa34 /fs/ocfs2/dlmfs/Makefile
parentMerge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mma... (diff)
parentscripts/extract-ikconfig: add xz compression support (diff)
downloadlinux-b87a2d3e3147bd140da2eae584772c353d11421b.tar.xz
linux-b87a2d3e3147bd140da2eae584772c353d11421b.zip
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: scripts/extract-ikconfig: add xz compression support kbuild: add GNU GLOBAL tags generation setlocalversion: update mercurial tag parsing
Diffstat (limited to 'fs/ocfs2/dlmfs/Makefile')
0 files changed, 0 insertions, 0 deletions