| commit | 69c1f05379a34786da96d0fdedc111cdcdecdf6f | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu May 22 23:27:17 2014 +0900 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu May 22 23:27:17 2014 +0900 |
| tree | 74a0cde11fbc619c227af89e0757036ab20323d0 | |
| parent | 007dfe5ad6d039df784b44285bae89654eab3258 [diff] | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 [diff] |
Merge 3.15-rc6 into staging-next. This resolves the conflicts in the files: drivers/iio/adc/Kconfig drivers/staging/rtl8723au/os_dep/usb_ops_linux.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>