summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 07:28:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 07:28:02 -0700
commite90e4d9234c953b29267cc4fc9ad804128773313 (patch)
treecd35351fa453a32ea5bd11089428e35c12049c0b /fs/gfs2
parent05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e (diff)
parent89d799d008710e048ee14df4f4e5441e9f4d5d50 (diff)
downloadop-kernel-dev-e90e4d9234c953b29267cc4fc9ad804128773313.zip
op-kernel-dev-e90e4d9234c953b29267cc4fc9ad804128773313.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: fix ast ordering for user locks dlm: cleanup remove unused code
Diffstat (limited to 'fs/gfs2')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud