Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
This commit is contained in:
Jiri Kosina
2011-07-11 14:15:48 +02:00
993 changed files with 34561 additions and 5907 deletions
+1
View File
@@ -11,6 +11,7 @@
*
*/
#include <linux/gpio.h>
#include <linux/module.h>
#include <linux/platform_device.h>