diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-19 00:08:58 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-19 00:08:58 +0300 |
commit | 02730d3c053a9af1d402e1c8dc8bbbc5a1340406 (patch) | |
tree | db289a08de50eb4b5caf7840d5b7356ddfa1c51f /drivers/iio/magnetometer/ak8975.c | |
parent | 77232f791e0605521a978cbe7f79a93df24df374 (diff) | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
download | linux-02730d3c053a9af1d402e1c8dc8bbbc5a1340406.tar.xz |
Merge 4.1-rc4 into tty-next
This resolves some tty driver merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/magnetometer/ak8975.c')
0 files changed, 0 insertions, 0 deletions