Greg Kroah-Hartman 9c5891bd43 Merge 3.11-rc3 into char-misc-next. ... This resolves a merge issue with: drivers/misc/mei/init.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-07-29 11:50:17 -07:00
..
amthif.c	mei: don't get stuck in select during reset	2013-07-26 17:54:30 -07:00
bus.c	mei: bus: do not overflow the device name buffer	2013-07-24 22:50:53 -07:00
client.c	mei: don't get stuck in select during reset	2013-07-26 17:54:30 -07:00
client.h	mei: don't get stuck in select during reset	2013-07-26 17:54:30 -07:00
debugfs.c	mei: convert to use simple_open()	2013-04-11 12:39:01 -07:00
hbm.c	mei: hbm: fix typo in error message	2013-07-23 19:31:33 -07:00
hbm.h	mei: support HBM versioning	2013-06-17 16:43:09 -07:00
hw-me-regs.h	mei: rename interface to hw-me	2013-01-08 16:40:45 -08:00
hw-me.c	mei: me: fix waiting for hw ready	2013-07-23 19:31:35 -07:00
hw-me.h	mei: revamp mei_data2slots	2013-03-15 11:10:48 -07:00
hw.h	mei: simplify preparing client host bus messages	2013-01-07 10:31:29 -08:00
init.c	Merge 3.11-rc3 into char-misc-next.	2013-07-29 11:50:17 -07:00
interrupt.c	mei: move mei_cl_irq_write_complete to client.c	2013-06-24 16:32:30 -07:00
Kconfig	mei: move mei-me to separate module	2013-03-29 08:32:21 -07:00
main.c	mei: don't get stuck in select during reset	2013-07-26 17:54:30 -07:00
Makefile	mei: nfc: Initial nfc implementation	2013-04-10 18:56:53 -07:00
mei_dev.h	mei: check whether hw start has succeeded	2013-06-24 16:33:28 -07:00
nfc.c	mei: nfc: fix nfc device freeing	2013-06-13 22:31:06 -07:00
pci-me.c	Merge 3.10-rc6 into char-misc-next	2013-06-17 11:54:25 -07:00
wd.c	mei: deprecate the mei_wd_state_independence_msg	2013-05-30 21:44:41 +09:00