Greg Kroah-Hartman 0c9e98af5e Merge Linux 3.0-rc6 into staging-next ... This handles the merge conflicts with the drivers/staging/brcm80211/Kconfig file due to changes on the two different branches. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-07-05 07:35:09 -07:00
..
hw.h	staging/mei: Hardware and MEI driver internal struct definition	2011-05-18 08:30:58 -07:00
init.c	Merge Linux 3.0-rc6 into staging-next	2011-07-05 07:35:09 -07:00
interface.c	staging: mei: rename num_mei_me_clients to me_clients_num	2011-06-28 13:21:32 -07:00
interface.h	staging/mei: MEI link layer	2011-05-18 08:30:57 -07:00
interrupt.c	staging: mei: fix possible usage of uninitialized variable	2011-06-28 13:21:33 -07:00
iorw.c	staging: mei: io_list functions revamp	2011-06-28 13:21:33 -07:00
Kconfig	staging/mei: add mei to staging Kbuild	2011-05-18 08:30:59 -07:00
main.c	Remove unneeded version.h include from drivers/staging/mei/main.c	2011-06-28 13:21:51 -07:00
Makefile	staging/mei: add mei to staging Kbuild	2011-05-18 08:30:59 -07:00
mei_dev.h	staging: mei: io_list functions revamp	2011-06-28 13:21:33 -07:00
mei_version.h	staging/mei: PCI device and char driver support.	2011-05-18 08:30:56 -07:00
mei.h	staging/mei: mei.h defining user space interface	2011-05-18 08:30:58 -07:00
mei.txt
TODO
wd.c	Merge Linux 3.0-rc6 into staging-next	2011-07-05 07:35:09 -07:00