Merge commit 'linus/master' into HEAD
authorVegard Nossum <vegard.nossum@gmail.com>
Mon, 15 Jun 2009 13:50:49 +0000 (15:50 +0200)
committerVegard Nossum <vegard.nossum@gmail.com>
Mon, 15 Jun 2009 13:50:49 +0000 (15:50 +0200)
commit722f2a6c87f34ee0fd0130a8cf45f81e0705594a
tree50b054df34d2731eb0ba0cf1a6c27e43e7eed428
parent7a0aeb14e18ad59394bd9bbc6e57fb345819e748
parent45e3e1935e2857c54783291107d33323b3ef33c8
Merge commit 'linus/master' into HEAD

Conflicts:
MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/traps.c
arch/x86/mm/init_32.c
include/linux/gfp.h
include/linux/interrupt.h
include/linux/slab.h
init/main.c
mm/slab.c
mm/slub.c