diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-13 14:59:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-13 14:59:42 -0800 |
| commit | 653f42f6b6348652c02737924abd6a5a6426e7ee (patch) | |
| tree | 466d9d722742f8f9c553226ffce200dc62f494ab /drivers/acpi/acpica/nsxfobj.c | |
| parent | 4dde6dedad736b86bcea3722abb7d8031aeeaa16 (diff) | |
| parent | 9d5a09e659f8414dd3713e2acbfaf8a9e9794aa1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: add missing spin_unlock at ceph_mdsc_build_path()
ceph: fix SEEK_CUR, SEEK_SET regression
crush: fix mapping calculation when force argument doesn't exist
ceph: use i_ceph_lock instead of i_lock
rbd: remove buggy rollback functionality
rbd: return an error when an invalid header is read
ceph: fix rasize reporting by ceph_show_options
Diffstat (limited to 'drivers/acpi/acpica/nsxfobj.c')
0 files changed, 0 insertions, 0 deletions