diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 17:02:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-28 17:02:03 -0400 |
| commit | e5c465f5d957ab581bc79d3ce981281fe73021a3 (patch) | |
| tree | d37f808b94d0cb46e88108d422da2c22deb721b7 /drivers/misc/ibmasm/ibmasm.h | |
| parent | d0a9af809124c432297a7c4a3bcf98cbfdb4036a (diff) | |
| parent | 2f5bf1f2d061dea5146aa283685ce2b00cea2f3d (diff) | |
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 'drivers/misc/ibmasm/ibmasm.h')
0 files changed, 0 insertions, 0 deletions