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-06-14 16:03:48 +01:00
2014-09-22 07:30:03 -07:00
2014-06-28 09:54:14 +01:00
2014-08-07 14:43:25 +01:00
2014-03-01 21:04:29 +00:00