Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jul 2010 18:10:53 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Jul 2010 18:10:53 +0000 (11:10 -0700)
commit6c50e1a49b4377b760ee46f824ed04b17be913e3
tree5e558bcd8fa3ca0d1a999e4c472d206aa688ec68
parentd2a97a4e99ff0ffdccd1fc46f22fb34270ef1e56
parent03066f23452ff088ad8e2c8acdf4443043f35b51
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: use complete_all and wake_up_all
  ceph: Correct obvious typo of Kconfig variable "CRYPTO_AES"
  ceph: fix dentry lease release
  ceph: fix leak of dentry in ceph_init_dentry() error path
  ceph: fix pg_mapping leak on pg_temp updates
  ceph: fix d_release dop for snapdir, snapped dentries
  ceph: avoid dcache readdir for snapdir