diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:13:38 +0900 |
commit | cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed (patch) | |
tree | a56d5024a453bb323039f7c481ac17738269e24f /lib/Kconfig | |
parent | 047e6646579c2853afba0111f573796daf4fd485 (diff) | |
parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
download | op-kernel-dev-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.zip op-kernel-dev-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.tar.gz |
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/Kconfig')
-rw-r--r-- | lib/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 2e491ac..f0df318 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -220,6 +220,7 @@ config ZLIB_INFLATE config ZLIB_DEFLATE tristate + select BITREVERSE config LZO_COMPRESS tristate |