Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	MAINTAINERS
	arch/x86/kernel/cpu/amd.c
	drivers/char/random.c

diff --cc MAINTAINERS
index 6a777667d7418f07447bf8115dbbaf2c7527ee2b,8460f6a69b29da71cdc8b74ddeda28816be50765..5d0ae134eedabc077235f1f16d0cd7e66dbc41f6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6498,13 -6364,11 +6498,18 @@@ W:   http://tcp-lp-mod.sourceforge.net
  S:    Maintained
  F:    net/ipv4/tcp_lp.c
  
 +TEAM DRIVER
 +M:    Jiri Pirko <jpirko@redhat.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/team/
 +F:    include/linux/if_team.h
 +
+ TECHNOLOGIC SYSTEMS TS-5500 MACHINE SUPPORT
+ M:    Savoir-faire Linux Inc. <ts-kernel@savoirfairelinux.com>
+ S:    Maintained
+ F:  arch/x86/platform/ts5500/*
+ 
  TEGRA SUPPORT
  M:    Colin Cross <ccross@android.com>
  M:    Olof Johansson <olof@lixom.net>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/vsyscall_64.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge