Greg Kroah-Hartman d84a2b0d6f Merge 3.17-rc6 into staging-next.
We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-22 07:30:03 -07:00
..
2014-09-19 10:50:30 -07:00
2014-08-22 10:47:59 -04:00
2014-07-11 04:57:36 -07:00
2014-09-20 10:43:37 -07:00
2014-09-12 11:59:10 -07:00
2014-08-18 14:17:41 +02:00