diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 07:22:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-30 07:22:38 -0700 |
| commit | be3fd3cc7c2142c46d5dcfec05e6031990d1f2ca (patch) | |
| tree | 606074b5c60ef823ad86174e408904c563eab38d /fs/ceph/messenger.h | |
| parent | 9623e5a23724d09283c238960946ec6f65733afe (diff) | |
| parent | eed63519e3e74d515d2007ecd895338d0ba2a85c (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Do not free zero sized per cpu areas
x86: Make sure free_init_pages() frees pages on page boundary
x86: Make smp_locks end with page alignment
Diffstat (limited to 'fs/ceph/messenger.h')
0 files changed, 0 insertions, 0 deletions