Merge branches 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git...

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf events: Fix ring_buffer_wakeup() brown paperbag bug

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling
  MAINTAINERS: Update tip.git related git trees

diff --combined MAINTAINERS
index b9db108,b9db108,9706a21..855afd4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -511,8 -511,8 -511,8 +511,8 @@@@ M:        Joerg Roedel <joerg.roedel@amd.com
   L:   iommu@lists.linux-foundation.org
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
   S:   Supported
  -F:   arch/x86/kernel/amd_iommu*.c
  -F:   arch/x86/include/asm/amd_iommu*.h
  +F:   drivers/iommu/amd_iommu*.[ch]
  +F:   include/linux/amd-iommu.h
   
   AMD MICROCODE UPDATE SUPPORT
   M:   Andreas Herrmann <andreas.herrmann3@amd.com>
@@@@ -1054,18 -1054,18 -1054,35 +1054,18 @@@@ ARM/SAMSUNG ARM ARCHITECTURE
   M:   Ben Dooks <ben-linux@fluff.org>
   M:   Kukjin Kim <kgene.kim@samsung.com>
   L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  +L:   linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
   W:   http://www.fluff.org/ben/linux/
   S:   Maintained
   F:   arch/arm/plat-samsung/
   F:   arch/arm/plat-s3c24xx/
   F:   arch/arm/plat-s5p/
  +F:   arch/arm/mach-s3c24*/
  +F:   arch/arm/mach-s3c64xx/
   F:   drivers/*/*s3c2410*
   F:   drivers/*/*/*s3c2410*
  -
  -ARM/S3C2410 ARM ARCHITECTURE
  -M:   Ben Dooks <ben-linux@fluff.org>
  -L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  -W:   http://www.fluff.org/ben/linux/
  -S:   Maintained
  -F:   arch/arm/mach-s3c2410/
  -
  -ARM/S3C244x ARM ARCHITECTURE
  -M:   Ben Dooks <ben-linux@fluff.org>
  -L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  -W:   http://www.fluff.org/ben/linux/
  -S:   Maintained
  -F:   arch/arm/mach-s3c2440/
  -F:   arch/arm/mach-s3c2443/
  -
  -ARM/S3C64xx ARM ARCHITECTURE
  -M:   Ben Dooks <ben-linux@fluff.org>
  -L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  -W:   http://www.fluff.org/ben/linux/
  -S:   Maintained
  -F:   arch/arm/mach-s3c64xx/
  +F:   drivers/spi/spi-s3c*
  +F:   sound/soc/samsung/*
   
   ARM/S5P EXYNOS ARM ARCHITECTURES
   M:   Kukjin Kim <kgene.kim@samsung.com>
@@@@ -3101,6 -3101,6 -3118,7 +3101,7 @@@@ F:    include/linux/hid
   
   HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
   M:   Thomas Gleixner <tglx@linutronix.de>
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
   S:   Maintained
   F:   Documentation/timers/
   F:   kernel/hrtimer.c
@@@@ -3610,7 -3610,7 -3628,7 +3611,7 @@@@ F:    net/irda
   IRQ SUBSYSTEM
   M:   Thomas Gleixner <tglx@linutronix.de>
   S:   Maintained
-- T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
   F:   kernel/irq/
   
   ISAPNP
@@@@ -4098,7 -4098,7 -4116,7 +4099,7 @@@@ F:    drivers/hwmon/lm90.
   LOCKDEP AND LOCKSTAT
   M:   Peter Zijlstra <peterz@infradead.org>
   M:   Ingo Molnar <mingo@redhat.com>
-- T:   git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
   S:   Maintained
   F:   Documentation/lockdep*.txt
   F:   Documentation/lockstat.txt
@@@@ -4302,9 -4302,9 -4320,8 +4303,9 @@@@ F:    include/linux/mm.
   F:   mm/
   
   MEMORY RESOURCE CONTROLLER
  +M:   Johannes Weiner <hannes@cmpxchg.org>
  +M:   Michal Hocko <mhocko@suse.cz>
   M:   Balbir Singh <bsingharora@gmail.com>
  -M:   Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
   M:   KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
   L:   cgroups@vger.kernel.org
   L:   linux-mm@kvack.org
@@@@ -5086,6 -5086,6 -5103,7 +5087,7 @@@@ M:    Peter Zijlstra <a.p.zijlstra@chello.
   M:   Paul Mackerras <paulus@samba.org>
   M:   Ingo Molnar <mingo@elte.hu>
   M:   Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
   S:   Supported
   F:   kernel/events/*
   F:   include/linux/perf_event.h
@@@@ -5165,6 -5165,6 -5183,7 +5167,7 @@@@ F:    drivers/scsi/pm8001
   
   POSIX CLOCKS and TIMERS
   M:   Thomas Gleixner <tglx@linutronix.de>
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
   S:   Supported
   F:   fs/timerfd.c
   F:   include/linux/timer*
@@@@ -5680,6 -5680,6 -5699,7 +5683,7 @@@@ F:    drivers/dma/dw_dmac.
   TIMEKEEPING, NTP
   M:   John Stultz <johnstul@us.ibm.com>
   M:   Thomas Gleixner <tglx@linutronix.de>
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
   S:   Supported
   F:   include/linux/clocksource.h
   F:   include/linux/time.h
@@@@ -5704,6 -5704,6 -5724,7 +5708,7 @@@@ F:    drivers/watchdog/sc1200wdt.
   SCHEDULER
   M:   Ingo Molnar <mingo@elte.hu>
   M:   Peter Zijlstra <peterz@infradead.org>
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
   S:   Maintained
   F:   kernel/sched*
   F:   include/linux/sched.h
@@@@ -6631,7 -6631,7 -6652,7 +6636,7 @@@@ TRACIN
   M:   Steven Rostedt <rostedt@goodmis.org>
   M:   Frederic Weisbecker <fweisbec@gmail.com>
   M:   Ingo Molnar <mingo@redhat.com>
-- T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
   S:   Maintained
   F:   Documentation/trace/ftrace.txt
   F:   arch/*/*/*/ftrace.h
@@@@ -7381,7 -7381,7 -7402,7 +7386,7 @@@@ M:    Thomas Gleixner <tglx@linutronix.de
   M:   Ingo Molnar <mingo@redhat.com>
   M:   "H. Peter Anvin" <hpa@zytor.com>
   M:   x86@kernel.org
-- T:   git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
++ T:   git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
   S:   Maintained
   F:   Documentation/x86/
   F:   arch/x86/