Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 99e9b20e8f0e..b7f6a88ce129 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2121,7 +2121,9 @@ M:	Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-edac@vger.kernel.org
 W:      bluesmoke.sourceforge.net
 S:      Maintained
-F:      drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c
+F:      drivers/edac/i7core_edac.c
+F:      drivers/edac/edac_mce.c
+F:      include/linux/edac_mce.h
 
 EDAC-I82975X
 M:      Ranganathan Desikan <ravi@jetztechnologies.com>
@@ -5327,6 +5329,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:      Maintained
 F:      arch/sparc/
+F:      drivers/sbus
 
 SPARC SERIAL DRIVERS
 M:      "David S. Miller" <davem@davemloft.net>