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

Browse source

Conflicts:
	drivers/net/usb/qmi_wwan.c

Overlapping additions of new device IDs to qmi_wwan.c

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-08-21 11:44:04 -07:00

parent 1a69205c47 0bad90985d

commit dc25b25897

110 changed files with 840 additions and 785 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/drm/drm_crtc.h

View file

18

include/linux/ata.h

View file

1

include/scsi/scsi_eh.h

View file

12

include/sound/soc-topology.h

View file

6

include/uapi/sound/asoc.h

View file