tree e9c62e59a879ebef45b0fc2823d318b2fb2fed84
parent c53badd0801728feedfcccae04239410b52b0d03
parent a24c5a0ea902bcda348f086bd909cc2d6e305bf8
author Pekka Enberg <penberg@kernel.org> 1300637606 +0200
committer Pekka Enberg <penberg@kernel.org> 1300637606 +0200

Merge branch 'slub/lockless' into for-linus

Conflicts:
	include/linux/slub_def.h