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

Conflicts:
	MAINTAINERS

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index dccfb93f762de2a299dc4163ff7e023a7a7abf2c,700125bbcd5acea42a5dfd135bccc54b996684fd..5ea3532be28a50c0be9c5c230ceecfe98a42830e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6506,13 -6492,11 +6506,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 kernel/sched.c
Simple merge