Merge branch 'next' into for-linus

First round of input updates for 3.14.
2014-01-23 08:10:44 -08:00
parent 8e2f2325b7 497ab1f290
commit 55df811f20
738 changed files with 6204 additions and 3473 deletions
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -74,7 +74,6 @@
 */

 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/module.h>