diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 14:20:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 14:20:04 +0300 |
| commit | 4096e645d85d575e7b6e699f470f5519c34fda5d (patch) | |
| tree | 9cfb8e2c1a816e2f7142d20b79c578fdf69dd2f2 /arch/x86/boot/compressed/mkpiggy.c | |
| parent | a0ca97b808c06793fd9dfb69243ce945c9fff501 (diff) | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
| download | linux-4096e645d85d575e7b6e699f470f5519c34fda5d.tar.xz | |
Merge 4.6-rc7 into staging-next
This fixes some merge issues with some iio drivers that were found in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/boot/compressed/mkpiggy.c')
0 files changed, 0 insertions, 0 deletions