Merge tag 'v4.2.4' into zygo-4.2.4-zb64

This is the 4.2.4 stable release

# gpg: Signature made Thu Oct 22 17:49:59 2015 EDT using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 647F 2865 4894 E3BD 4571  99BE 38DB BDC8 6092 693E

diff --cc fs/btrfs/inode.c
Simple merge