Merge branch 'akpm' (patches from Andrew Morton)
Merge fixes from Andrew Morton: "A few fixes. One is a licensing change and I don't do licensing, so please eyeball that one" Licensing eye-balled. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: lib/lz4: correct the LZ4 license memcg: get rid of swapaccount leftovers nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error drivers/platform/olpc/olpc-ec.c: initialise earlier
Showing
- Documentation/kernel-parameters.txt 1 addition, 1 deletionDocumentation/kernel-parameters.txt
- drivers/platform/olpc/olpc-ec.c 1 addition, 1 deletiondrivers/platform/olpc/olpc-ec.c
- fs/nilfs2/segbuf.c 2 additions, 3 deletionsfs/nilfs2/segbuf.c
- init/Kconfig 1 addition, 1 deletioninit/Kconfig
- lib/lz4/lz4_compress.c 2 additions, 2 deletionslib/lz4/lz4_compress.c
- lib/lz4/lz4_decompress.c 3 additions, 3 deletionslib/lz4/lz4_decompress.c
- lib/lz4/lz4hc_compress.c 2 additions, 2 deletionslib/lz4/lz4hc_compress.c
- mm/memcontrol.c 0 additions, 1 deletionmm/memcontrol.c
Loading
Please register or sign in to comment