!FIXUP: boot issues with latest merge from main
authorBharat Nihalani <bnihalani@nvidia.com>
Mon, 30 Sep 2013 11:11:06 +0000 (16:11 +0530)
committerDan Willemsen <dwillemsen@nvidia.com>
Mon, 30 Sep 2013 21:50:15 +0000 (14:50 -0700)
commit55ab31a01f8cbf08300cd03cc10da07d0cc2377e
treedaf59a3ebbf83d52895f7d668d3174f018d9f61d
parent97b8f9da8cf8e59e90db5714e32d3c2df6dcc959
!FIXUP: boot issues with latest merge from main

Change-Id: I47e7cbfd840df5871d24664fdf15311e7ba65e23
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/280243
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ajay Nandakumar M <anandakumarm@nvidia.com>
Tested-by: Ajay Nandakumar M <anandakumarm@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
drivers/staging/iio/adc/palmas_gpadc.c
drivers/thermal/generic_adc_thermal.c