]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branches 'pstore-fixes' and 'syscalls2' into release
authorTony Luck <tony.luck@intel.com>
Wed, 23 Mar 2011 16:13:47 +0000 (09:13 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 23 Mar 2011 16:13:47 +0000 (09:13 -0700)

Trivial merge