diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-23 09:52:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-23 09:52:32 -0700 |
| commit | 3db0d4defc36fd9ea4d8e09170d4584d41024cd6 (patch) | |
| tree | 78ee6d6839fce9c0065eeb996a95cc531b74200a /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 (diff) | |
| parent | lib/lz4: correct the LZ4 license (diff) | |
| download | wireguard-linux-3db0d4defc36fd9ea4d8e09170d4584d41024cd6.tar.xz wireguard-linux-3db0d4defc36fd9ea4d8e09170d4584d41024cd6.zip | |
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
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions