Merge branch 'android-3.10' into android-goldfish-3.10

664c7d3ff828 BACKPORT: ip6_gre: fix ip6gre_err() invalid reads
88c573e1342e BACKPORT: dccp/tcp: do not inherit mc_list from parent
5554d4c27e17 UPSTREAM: dm ioctl: prevent stack leak in dm ioctl call
d342691ca521 UPSTREAM: tcp: avoid infinite loop in tcp_splice_read()
fcb56ee9ea5f ANDROID: sdcardfs: d_splice_alias can return error values
227c2cf255c0 android: base-cfg: disable CONFIG_NFSD and CONFIG_NFS_FS
ab55b69b30e6 BACKPORT: f2fs: sanity check size of nat and sit cache
4a5ae6f08b3d ANDROID: hid: uhid: implement refcount for open and close

Change-Id: I8ae76801ba1e7b98afd2cda133054d1cc394cd39