]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'rados' of ssh://ceph.newdream.net/git/ceph into rados
authorSage Weil <sage@newdream.net>
Fri, 11 Jan 2008 22:24:31 +0000 (14:24 -0800)
committerSage Weil <sage@newdream.net>
Fri, 11 Jan 2008 22:24:31 +0000 (14:24 -0800)
1  2 
src/kernel/super.c

Simple merge