diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:32:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:32:39 -0400 |
| commit | e7849f16c13476288fe4fbd420975e8456c75aa0 (patch) | |
| tree | a4f4f4a720210dd4a7879f979c9c79b6d0b75a3f /fs/gfs2/locking/dlm/lock_dlm.h | |
| parent | af5329cdf51cdd208a323e521faa46800a16d2ec (diff) | |
| parent | 131b943ae643b1ad6febd67cdbb31d955706ecf4 (diff) | |
Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
cputopology: always define CPU topology information, clean up
cpu topology: always define CPU topology information
Diffstat (limited to 'fs/gfs2/locking/dlm/lock_dlm.h')
0 files changed, 0 insertions, 0 deletions