Merge tag 'v3.11' into for-linus

Linux 3.11

99 files changed, 956 insertions, 410 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8197fbd70a3e..b140c8123098 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6066,7 +6066,7 @@ M:	Rob Herring <rob.herring@calxeda.com>
 M:      Pawel Moll <pawel.moll@arm.com>
 M:      Mark Rutland <mark.rutland@arm.com>
 M:      Stephen Warren <swarren@wwwdotorg.org>
-M:      Ian Campbell <ian.campbell@citrix.com>
+M:      Ian Campbell <ijc+devicetree@hellion.org.uk>
 L:      devicetree@vger.kernel.org
 S:      Maintained
 F:      Documentation/devicetree/
diff --git a/Makefile b/Makefile
index 369882e4fc77..fe8204be566d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 11
 SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION =
 NAME = Linux for Workgroups
 
 # *DOCUMENTATION*
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 2c70f74fed5d..e110b6d4ae8c 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -42,7 +42,6 @@ static const char *atlas6_dt_match[] __initdata = {
 
 DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
-        .nr_irqs        = 128,
         .map_io         = sirfsoc_map_io,
         .init_time      = sirfsoc_init_time,
         .init_late      = sirfsoc_init_late,
@@ -59,7 +58,6 @@ static const char *prima2_dt_match[] __initdata = {