summaryrefslogtreecommitdiff
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 00:10:45 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 00:10:45 (GMT)
commit3e66848a3249105fe4973b0550b5b6cd42240168 (patch)
tree3ff7bbcf2a476291f5536ea09b256c541c4456f3 /drivers/staging/iio
parent2cda64cf6998a1d10961f69e2ac79c69b6d37795 (diff)
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff)
downloadlinux-3e66848a3249105fe4973b0550b5b6cd42240168.tar.xz
Merge 4.5-rc6 into staging-next
We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio')
0 files changed, 0 insertions, 0 deletions