6 Commits

Author	SHA1	Message	Date
Greg Kroah-Hartman	5b1f6d81e4	Merge 3.5-rc7 into char-misc-next. ... This lets us pick up the mei driver changes that we need in order to handle future merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-07-18 06:22:45 -07:00
Tomas Winkler	7cb1ba9b67	mei: mei_wd_host_init: update the comment ... Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-07-10 14:58:35 -07:00
Tomas Winkler	d242a0afb2	mei: remove write only wariable wd_due_counter ... Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-07-10 14:58:35 -07:00
Tomas Winkler	49fbd3f1c3	misc: mei: set WDIOF_ALARMONLY on mei watchdog ... mei watchdog doesn't reboot the system it only produces event therefore mark it as WDIOF_ALARMONLY. This patch depends on: commit 2bbeed016d Author: Alan Cox <alan@linux.intel.com> watchdog: Add a flag to indicate the watchdog doesn't reboot things Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-06-13 15:34:31 -07:00
Tomas Winkler	4f3afe1d8c	mei: export mei.h for the user space ... The header exports API for application layer 1. move under include/linux and add to the export list 2. update include path n the sources 3. update TODO Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-05-09 13:58:06 -07:00
Greg Kroah-Hartman	ffc2825c29	Staging: mei: move the mei code out of staging ... It's been cleaned up, and there's nothing else left to do, so move it out of staging into drivers/misc/ where all can use it now. Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Oren Weil <oren.jer.weil@intel.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-05-01 18:23:38 -04:00