From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Sep 2014 14:30:03 +0000 (-0700)
Subject: Merge 3.17-rc6 into staging-next.
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~304
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a;p=pandora-kernel.git

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>
---

d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a
Reading git-diff-tree failed