From: Linus Torvalds Date: Fri, 23 Aug 2013 16:52:32 +0000 (-0700) Subject: Merge branch 'akpm' (patches from Andrew Morton) X-Git-Tag: firefly_0821_release~176^2~5517 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3db0d4defc36fd9ea4d8e09170d4584d41024cd6;p=firefly-linux-kernel-4.4.55.git 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 : 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 --- 3db0d4defc36fd9ea4d8e09170d4584d41024cd6