diff options
author | 2010-08-22 10:08:52 -0700 | |
---|---|---|
committer | 2010-08-22 10:08:52 -0700 | |
commit | bc584c5107bfd97e2aa41c798e3b213bcdd4eae7 (patch) | |
tree | 13cb518e2f4f2aac46aefbbaacb6e4fa3fbb58a2 /arch/x86/mm/fault.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff) | |
parent | slab: fix object alignment (diff) | |
download | linux-dev-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.tar.xz linux-dev-bc584c5107bfd97e2aa41c798e3b213bcdd4eae7.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: fix object alignment
slub: add missing __percpu markup in mm/slub_def.h
Diffstat (limited to 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions