]> 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: e0985f2 310e5ca)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 20:16:52 +0000 (12:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Feb 2011 20:16:52 +0000 (12:16 -0800)

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