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

Trivial merge