]> 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: 16a9d06 687beaa)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Aug 2011 18:20:09 +0000 (14:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Aug 2011 18:20:09 +0000 (14:20 -0400)

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