Merge 3.11-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 17:22:49 +0000 (10:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 17:22:49 +0000 (10:22 -0700)
commitfbf8d7106c926d375c76e65cc878f4fa7b91cbc3
treee9faf7f8a9ce8da9ad2e2a3f1768a4af414670d4
parent98f62b7a082e1e9eb762c7329a704316f6e07698
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8
Merge 3.11-rc5 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/ti_am335x_adc.c