Merge tag 'v3.14.21' of /src/linux/linux-stable into aufs3.14.21+/10static

This is the 3.14.21 stable release
version aufs3.14.21+

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>
Merge remote-tracking branch 'aufs3-standalone/aufs3.14.21+/00base' into aufs3.14.21+/10static
Merge branch 'aufs3.14.21+/10static' into aufs3.14.21+/11proc_map

Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

Conflicts:
	mm/Makefile
Merge branch 'aufs3.14.21+/11proc_map' into aufs3.14.21+/18public
Merge remote-tracking branch 'origin_aufs3/aufs3.14.21+' into MA-E3xx/linux-3.14.y