]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Wed, 31 Oct 2012 06:56:48 +0000 (08:56 +0200)
committerPekka Enberg <penberg@kernel.org>
Wed, 31 Oct 2012 06:56:48 +0000 (08:56 +0200)

Trivial merge