]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a44fe13 411b67b)
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:38:46 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:38:46 +0000 (08:38 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.