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
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	bug.h: Fix up CONFIG_BUG=n implicit function declarations.	2012-06-25 10:32:49 -07:00
crypto	…
drm	drm: drop comment about this header being autogenerated.	2012-06-22 11:04:55 +01:00
keys	KEYS: Permit in-place link replacement in keyring list	2012-05-11 10:56:56 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
math-emu	…
media	[media] patch for Asus My Cinema PS3-100 (1043:48cd)	2012-05-20 16:05:02 -03:00
memory	ddr: add LPDDR2 data from JESD209-2	2012-05-02 00:04:06 -07:00
misc	…
mtd	UBI: amend commentaries WRT dtype	2012-05-20 20:25:59 +03:00
net	ipv4: Kill rt->rt_spec_dst, no longer used.	2012-06-28 04:05:27 -07:00
pcmcia	…
rdma	Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus	2012-05-21 09:00:47 -07:00
rxrpc	…
scsi	SCSI & usb-storage: add try_rc_10_first flag	2012-06-22 22:05:31 -07:00
sound	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-06-25 14:53:09 -07:00
target	target: Add TFO->put_session() caller for HW fabric session shutdown	2012-06-12 19:33:05 -07:00
trace	rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks	2012-06-06 20:43:27 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild	…