Greg Kroah-Hartman e9563355ac Staging: Merge staging-next into Linus's tree ...

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/device.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-08-05 14:18:03 -07:00

..

blkvsc_drv.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

blkvsc.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

channel_interface.c

Staging: hv: rename VmbusPrivate.h to vmbus_private.h

2010-05-11 11:36:17 -07:00

channel_interface.h

Staging: hv: rename VmbusApi.h to vmbus_api.h

2010-05-11 11:36:17 -07:00

channel_mgmt.c

Staging: Merge staging-next into Linus's tree

2010-08-05 14:18:03 -07:00

channel_mgmt.h

Staging: hv: remove RING_BUFFER_INFO typedef

2010-07-27 11:43:11 -07:00

channel.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

channel.h

Staging: hv: rename ChannelMgmt.c and .h to channel_mgmt.c and .h

2010-05-11 11:36:17 -07:00

connection.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

hv_api.h

Staging: fix assorted typos all over the place

2009-12-11 12:23:20 -08:00

hv_timesource.c

Staging: hyperv: add clocksource driver

2010-07-08 14:15:11 -07:00

hv_utils.c

Staging: Merge staging-next into Linus's tree

2010-08-05 14:18:03 -07:00

hv.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

hv.h

Staging: hv: rename Hv.h to hv.h

2010-05-11 11:36:16 -07:00

Kconfig

staging: hv: Fix Kconfig dependency of hv_blkvsc

2010-07-26 15:38:13 -07:00

logging.h

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

Makefile

Staging: hyperv: add clocksource driver

2010-07-08 14:15:11 -07:00

netvsc_api.h

Staging: hv: rename VmbusApi.h to vmbus_api.h

2010-05-11 11:36:17 -07:00

netvsc_drv.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

netvsc.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

netvsc.h

Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h

2010-05-11 11:36:18 -07:00

osd.c

staging: hv: Corrected all header comment formats kernel-doc format

2010-05-11 11:35:32 -07:00

osd.h

Staging: hv: fix oops in vmbus - missing #include

2009-10-30 14:47:43 -07:00

ring_buffer.c

Staging: hv: remove RING_BUFFER typedef

2010-07-27 11:47:08 -07:00

ring_buffer.h

Staging: hv: remove RING_BUFFER typedef

2010-07-27 11:47:08 -07:00

rndis_filter.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

rndis_filter.h

Staging: hv: rename RndisFilter.c and .h to rndis_filter.c and .h

2010-05-11 11:36:17 -07:00

rndis.h

Staging: hv: trivial whitespace fixes found by checkpatch.pl

2010-05-11 11:35:36 -07:00

storvsc_api.h

Staging: hv: rename VmbusApi.h to vmbus_api.h

2010-05-11 11:36:17 -07:00

storvsc_drv.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

storvsc.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

TODO

Staging: hv: use network device stats

2010-05-11 11:35:34 -07:00

utils.h

staging: hv: Added heartbeat functionality to hv_utils

2010-05-17 16:32:30 -07:00

version_info.h

staging: hv: Added heartbeat functionality to hv_utils

2010-05-17 16:32:30 -07:00

vmbus_api.h

Staging: hv: rename VmbusApi.h to vmbus_api.h

2010-05-11 11:36:17 -07:00

vmbus_channel_interface.h

Staging: hv: rename VmbusChannelInterface.h to vmbus_channel_interface.h

2010-05-11 11:36:17 -07:00

vmbus_drv.c

Staging: Merge staging-next into Linus's tree

2010-08-05 14:18:03 -07:00

vmbus_packet_format.h

Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h

2010-05-11 11:36:18 -07:00

vmbus_private.h

Staging: hv: rename VmbusPrivate.h to vmbus_private.h

2010-05-11 11:36:17 -07:00

vmbus.c

Staging: hv: remove DPRINT_EXIT macro

2010-07-22 15:14:04 -07:00

vmbus.h

staging: hv: Fix race condition on vmbus channel initialization

2010-06-30 08:18:14 -07:00

vstorage.h

Staging: hv: fix spaces coding style issue in vstorage.h

2010-05-11 11:35:38 -07:00