]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Thu, 10 Nov 2011 19:27:09 +0000 (21:27 +0200)
committerPekka Enberg <penberg@kernel.org>
Thu, 10 Nov 2011 19:27:09 +0000 (21:27 +0200)

Trivial merge