Greg Kroah-Hartman f341dddf1d Staging: merge staging patches into Linus's main branch ... There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-03-04 08:39:02 -08:00
..
blkvsc_drv.c	Staging: merge staging patches into Linus's main branch	2010-03-04 08:39:02 -08:00
BlkVsc.c	Staging: hv: Fix some missing author names	2009-11-30 16:39:35 -08:00
Channel.c	Staging: hv: fix brace coding style issue in Channel.c	2010-03-03 16:42:37 -08:00
Channel.h	Staging: hv: remove PFN_CHANNEL_CALLBACK	2009-09-15 12:02:03 -07:00
ChannelInterface.c
ChannelInterface.h
ChannelMgmt.c	Staging: hv: Fix vmbus event handler bug	2009-11-30 16:39:29 -08:00
ChannelMgmt.h	Staging: hv: fix oops in vmbus - missing #include	2009-10-30 14:47:43 -07:00
Connection.c	Staging: hv: remove more usages of internal list routines	2009-09-15 12:02:04 -07:00
hv_api.h	Staging: fix assorted typos all over the place	2009-12-11 12:23:20 -08:00
Hv.c	Staging: hv: Remove xen legacy code and check for Hyper-V	2010-03-03 16:42:37 -08:00
Hv.h	Staging: hv: Remove xen legacy code and check for Hyper-V	2010-03-03 16:42:37 -08:00
Kconfig
logging.h
Makefile
netvsc_drv.c	Staging: hv: Rename struct device_context and re-arrange the fields inside	2010-03-03 16:42:37 -08:00
NetVsc.c	Staging: hv: Fix some missing author names	2009-11-30 16:39:35 -08:00
NetVsc.h	Staging: hv: Fix some missing author names	2009-11-30 16:39:35 -08:00
NetVscApi.h	Staging: hv: remove unneeded OnClose callback	2010-03-03 16:42:36 -08:00
osd.c	staging: Complete sched.h removal from interrupt.h	2009-10-14 14:14:37 -07:00
osd.h	Staging: hv: fix oops in vmbus - missing #include	2009-10-30 14:47:43 -07:00
RingBuffer.c	Staging: hv: fix various coding style issues in RingBuffer.c	2010-03-03 16:42:37 -08:00
RingBuffer.h
rndis.h
RndisFilter.c	Staging: hv: remove unneeded OnClose callback	2010-03-03 16:42:36 -08:00
RndisFilter.h
storvsc_drv.c	Staging: hv: Rename struct device_context and re-arrange the fields inside	2010-03-03 16:42:37 -08:00
StorVsc.c	Staging: hv: remove unneeded OnHostReset callback	2010-03-03 16:42:36 -08:00
StorVscApi.h	Staging: hv: remove unneeded OnHostReset callback	2010-03-03 16:42:36 -08:00
TODO	Staging: hv TODO patches	2009-10-30 14:47:42 -07:00
VersionInfo.h	Staging: hv: Add proper versioning to HV drivers	2010-03-03 16:42:37 -08:00
vmbus_drv.c	Staging: hv: match on DMI values to know if we should run.	2010-03-03 16:42:37 -08:00
Vmbus.c	Staging: hv: Add proper versioning to HV drivers	2010-03-03 16:42:37 -08:00
vmbus.h	Staging: hv: Rename struct device_context and re-arrange the fields inside	2010-03-03 16:42:37 -08:00
VmbusApi.h
VmbusChannelInterface.h
VmbusPacketFormat.h
VmbusPrivate.h	Staging: hv: remove more usages of internal list routines	2009-09-15 12:02:04 -07:00
vstorage.h