Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebase

This is the 3.10.12 stable release

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

diff --cc Makefile
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/linux/regmap.h
Simple merge

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge