Merge branch 'next' into for-linus

Prepare first round of input updates for 4.8 merge window.
2016-07-26 12:07:15 -07:00
parent e9003c9cfa 0097ff3d5d
commit 0808882863
42 changed files with 2932 additions and 139 deletions
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -27,7 +27,6 @@ enum rmi_f12_object_type {
 };

 struct f12_data {
-	struct rmi_function *fn;
 	struct rmi_2d_sensor sensor;
 	struct rmi_2d_sensor_platform_data sensor_pdata;