diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 07:28:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 07:28:02 -0700 |
| commit | e90e4d9234c953b29267cc4fc9ad804128773313 (patch) | |
| tree | cd35351fa453a32ea5bd11089428e35c12049c0b /fs/gfs2/inode.c | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| parent | dlm: fix ast ordering for user locks (diff) | |
| download | linux-dev-e90e4d9234c953b29267cc4fc9ad804128773313.tar.xz linux-dev-e90e4d9234c953b29267cc4fc9ad804128773313.zip | |
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/inode.c')
0 files changed, 0 insertions, 0 deletions