]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slub/lockless' into for-next
authorPekka Enberg <penberg@kernel.org>
Thu, 7 Jul 2011 19:27:52 +0000 (22:27 +0300)
committerPekka Enberg <penberg@kernel.org>
Thu, 7 Jul 2011 19:27:52 +0000 (22:27 +0300)

Trivial merge