| commit | af52739b922f656eb1f39016fabaabe4baeda2e2 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 20 08:25:44 2016 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 20 08:25:44 2016 -0700 |
| tree | 79a7aa810d0493cd0cf4adebac26d37f12e8b545 | |
| parent | 25ed6a5e97809129a1bc852b6b5c7d03baa112c4 [diff] | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e [diff] |
Merge 4.7-rc4 into staging-next We want the fixes in here, and we can resolve a merge issue in drivers/iio/industrialio-trigger.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>