Merge tag 'v3.18-rc4' into regulator-max77802

Linux 3.18-rc4
2014-11-26 20:37:57 +00:00
parent 45fc84c668 206c5f60a3
commit cf2394f70c
1139 changed files with 21142 additions and 10283 deletions
@@ -35,6 +35,8 @@
 #ifndef __LINUX_REGULATOR_CONSUMER_H_
 #define __LINUX_REGULATOR_CONSUMER_H_

+#include <linux/err.h>
+
 struct device;
 struct notifier_block;
 struct regmap;