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	USB: Add macros for interrupt endpoint types.	2012-05-18 15:42:02 -07:00
ch11.h	USB: Add support to enable/disable USB3 link states.	2012-05-18 15:41:58 -07:00
chipidea.h	usb: chipidea: add power_budget limit for ehci to platform data	2012-05-11 16:59:35 -07:00
composite.h	usb: gadget: composite: add iSerialNumber to usb_composite_driver	2012-05-10 12:22:43 -07:00
ehci_def.h
ehci_pdriver.h
functionfs.h	FunctionFS: enable multiple functions	2012-05-14 09:25:44 -07:00
g_hid.h
g_printer.h
gadget.h
gadgetfs.h
gpio_vbus.h	USB: gpio_vbus: wakeup support on GPIO VBUS interrupts	2012-05-17 11:20:34 -07:00
hcd.h	USB: add NO_D3_DURING_SLEEP flag and revert 151b612847	2012-06-13 13:11:39 -07:00
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	usb/net: rndis: break out <linux/rndis.h> defines	2012-05-12 15:02:22 -04:00
serial.h	USB: serial: hook up reset_resume callback	2012-05-15 15:40:00 -07:00
sl811.h
storage.h
tmc.h
uas.h
ulpi.h
usbnet.h	usbnet: remove flag of EVENT_DEV_WAKING	2012-06-12 18:51:08 -07:00
video.h
wusb-wa.h
wusb.h