Merge remote branch 'tip/x86/atomic' into slub/lockless
authorPekka Enberg <penberg@kernel.org>
Sat, 2 Jul 2011 10:26:23 +0000 (13:26 +0300)
committerPekka Enberg <penberg@kernel.org>
Sat, 2 Jul 2011 10:26:23 +0000 (13:26 +0300)

Trivial merge