diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 17:33:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 17:33:17 -0700 |
| commit | 7608a864e5211df1e3c1948e2719aec7c27b9333 (patch) | |
| tree | cd828f7b47731f90f4f9300130bc0977125d2a3c /fs/ocfs2/ocfs2.h | |
| parent | 7713a7d195c2e11d7ba6a973317da0af862d1264 (diff) | |
| parent | f798634d806615bee27d1b83479034087a02aa0f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SERIAL] SUNHV: Fix jerky console on LDOM guests.
[SPARC64]: Fix race between MD update and dr-cpu add.
[SPARC64]: SMP build fix.
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
0 files changed, 0 insertions, 0 deletions