]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Sat, 10 Mar 2012 08:45:57 +0000 (10:45 +0200)
committerPekka Enberg <penberg@kernel.org>
Sat, 10 Mar 2012 08:45:57 +0000 (10:45 +0200)

Trivial merge