Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus

2012-07-27 23:06:32 +01:00
parent 28a33cbc24 ad72254114 d0a533b182 ff081e05bf 339ca09d7a cb70706c82
commit 91b006def3
69 changed files with 963 additions and 753 deletions
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/io.h>

 #include <mach/hardware.h>
 #include <mach/jornada720.h>