]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'nvram' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:38 +0000 (14:36 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 9 Dec 2010 03:36:38 +0000 (14:36 +1100)

Trivial merge