tree ff7026df8e8715e3c63d0ff4ff697a9fac6323fb
parent 82aee5d7c01fd1a398e938e496e6cb8841775f91
parent 76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328
author David S. Miller <davem@davemloft.net> 1340930220 -0700
committer David S. Miller <davem@davemloft.net> 1340930220 -0700

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
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("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>