Greg Kroah-Hartman 9f48c89862 Merge 3.16-rc5 into char-misc-next ...

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-07-13 15:26:47 -07:00

..

channel_mgmt.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-06-12 14:27:40 -07:00

channel.c

hyperv: remove meaningless pr_err() in vmbus_recvpacket_raw()

2014-07-09 14:21:27 -07:00

connection.c

Drivers: hv: vmbus: Fix a bug in the channel callback dispatch code

2014-07-09 14:34:35 -07:00

hv_balloon.c

Drivers: hv: balloon: Ensure pressure reports are posted regularly

2014-05-03 19:25:17 -04:00

hv_fcopy.c

Drivers: hv: fcopy_open() can be static

2014-02-18 12:24:55 -08:00

hv_kvp.c

Drivers: hv: util: Fix a bug in the KVP code

2014-07-09 14:34:35 -07:00

hv_snapshot.c

connector: add portid to unicast in addition to broadcasting

2014-02-07 15:40:17 -08:00

hv_util.c

Drivers: hv: util: Fix a bug in the KVP code

2014-07-09 14:34:35 -07:00

hv.c

Drivers: hv: vmbus: Implement per-CPU mapping of relid to channel

2014-05-03 19:24:26 -04:00

hyperv_vmbus.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-06-12 14:27:40 -07:00

Kconfig

x86: Make Linux guest support optional

2013-03-04 13:14:25 -08:00

Makefile

Drivers: hv: Implement the file copy service

2014-02-18 10:53:48 -08:00

ring_buffer.c

Drivers: hv: vmbus: Cleanup the packet send path

2014-02-07 15:22:40 -08:00

vmbus_drv.c

hyper-v: make uuid_le const

2014-06-03 18:18:38 -07:00