Merge tag 'v3.18.17' into msm-3.18

Linux 3.18.17

Resolve trivial context conflicts as part of the merge.

Conflicts:
	net/ipv4/tcp.c

Change-Id: If0b8c8e205366ee8b1b5b7b90943a6c598297b1c
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>