Al Viro 237dae8890 Merge branch 'iocb' into for-davem ...

trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2015-04-09 00:01:38 -04:00

..

amthif.c

fs: move struct kiocb to fs.h

2015-03-25 20:28:11 -04:00

bus.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

client.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

client.h

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

debugfs.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

hbm.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

hbm.h

mei: fix hbm MEI_HBM_STARTED ambiguity

2014-11-07 09:59:08 -08:00

hw-me-regs.h

mei: read and print all six FW status registers

2014-11-26 19:06:41 -08:00

hw-me.c

mei: me: release hw from reset only during the reset flow

2015-02-03 15:48:51 -08:00

hw-me.h

mei: read and print all six FW status registers

2014-11-26 19:06:41 -08:00

hw-txe-regs.h

mei: extract fw status registers

2014-05-03 19:21:22 -04:00

hw-txe.c

mei: read and print all six FW status registers

2014-11-26 19:06:41 -08:00

hw-txe.h

mei: fix kernel-doc warnings

2014-09-29 11:56:02 -04:00

hw.h

mei: fix kernel-doc warnings

2014-09-29 11:56:02 -04:00

init.c

mei: make device disabled on stop unconditionally

2015-03-01 19:34:50 -08:00

interrupt.c

mei: drop unneeded client NULL check in cb structure

2014-11-03 15:52:48 -08:00

Kconfig

mei: fix compilation error with missing WATCHDOG_CORE

2014-02-14 10:13:46 -08:00

main.c

fs: move struct kiocb to fs.h

2015-03-25 20:28:11 -04:00

Makefile

mei: txe: add Kbuild for TXE device

2014-02-07 15:08:46 -08:00

mei_dev.h

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

nfc.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00

pci-me.c

fs: move struct kiocb to fs.h

2015-03-25 20:28:11 -04:00

pci-txe.c

Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-12-14 16:43:47 -08:00

wd.c

mei: add reference counting for me clients

2015-01-25 09:17:56 -08:00