Linus Torvalds 3db0d4defc 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

2013-08-23 09:52:32 -07:00

..

goldfish

goldfish: Add a FIXME note to the pipe driver

2013-01-24 13:51:38 -08:00

olpc

drivers/platform/olpc/olpc-ec.c: initialise earlier

2013-08-23 09:51:22 -07:00

x86

Revert "hp-wmi: Enable hotkeys on some systems"

2013-08-18 13:23:31 -04:00

Kconfig

goldfish: add QEMU pipe driver

2013-01-24 13:49:34 -08:00

Makefile

goldfish: add the goldfish virtual bus

2013-01-24 13:49:34 -08:00