]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'slab/next' into for-next
authorPekka Enberg <penberg@kernel.org>
Sun, 27 Nov 2011 20:08:45 +0000 (22:08 +0200)
committerPekka Enberg <penberg@kernel.org>
Sun, 27 Nov 2011 20:08:45 +0000 (22:08 +0200)

Trivial merge