diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 23:02:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 23:02:03 +0200 |
| commit | e5c465f5d957ab581bc79d3ce981281fe73021a3 (patch) | |
| tree | d37f808b94d0cb46e88108d422da2c22deb721b7 /kernel/power/disk.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | ocfs2_dlm: Check for migrateable lockres in dlm_empty_lockres() (diff) | |
| download | linux-e5c465f5d957ab581bc79d3ce981281fe73021a3.tar.xz linux-e5c465f5d957ab581bc79d3ce981281fe73021a3.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:
ocfs2_dlm: Check for migrateable lockres in dlm_empty_lockres()
ocfs2_dlm: Fix lockres ref counting bug
Diffstat (limited to 'kernel/power/disk.c')
0 files changed, 0 insertions, 0 deletions