Merge branch 'misc' into for-next

2013-11-12 10:58:27 +00:00
parent 959f58544b aed3a4ed72
commit ec1e20a02f
35 changed files with 467 additions and 279 deletions
@@ -21,7 +21,7 @@
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>

-#define AMBA_NR_IRQS	2
+#define AMBA_NR_IRQS	9
 #define AMBA_CID	0xb105f00d

 struct clk;