]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branches 'topic/slab/fixes' and 'topic/slub/fixes' into for-linus
authorPekka Enberg <penberg@cs.helsinki.fi>
Mon, 2 Feb 2009 09:18:49 +0000 (11:18 +0200)
committerPekka Enberg <penberg@cs.helsinki.fi>
Mon, 2 Feb 2009 09:18:49 +0000 (11:18 +0200)

Trivial merge