David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

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

2012-06-28 17:37:00 -07:00

..

association.h

…

atmel_usba_udc.h

…

audio-v2.h

…

audio.h

…

c67x00.h

…

cdc-wdm.h

…

cdc.h

…

ch9.h

…

ch11.h

…

chipidea.h

…

composite.h

…

ehci_def.h

…

ehci_pdriver.h

…

functionfs.h

…

g_hid.h

…

g_printer.h

…

gadget.h

…

gadgetfs.h

…

gpio_vbus.h

…

hcd.h

…

input.h

…

intel_mid_otg.h

…

iowarrior.h

…

irda.h

…

isp116x.h

…

isp1301.h

…

isp1362.h

…

isp1760.h

…

Kbuild

…

m66592.h

…

midi.h

…

msm_hsusb_hw.h

…

msm_hsusb.h

…

musb.h

…

net2280.h

…

ohci_pdriver.h

…

otg.h

…

quirks.h

…

r8a66597.h

…

renesas_usbhs.h

…

rndis_host.h

…

serial.h

…

sl811.h

…

storage.h

…

tmc.h

…

uas.h

…

ulpi.h

…

usbnet.h

…

video.h

…

wusb-wa.h

…

wusb.h

…