David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
asm-generic	net: introduce SO_MAX_PACING_RATE	2013-09-28 15:35:41 -07:00
drm	drm: Pad drm_mode_get_connector to 64-bit boundary	2013-10-18 07:42:23 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
mtd	UBI: document UBI_IOCVOLUP better in user header	2013-05-29 15:19:26 +03:00
rdma	IB/core: Temporarily disable create_flow/destroy_flow uverbs	2013-10-21 09:44:17 -07:00
scsi	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
sound	ALSA: hdspm - Fix SNDRV_HDSPM_IOCTL_GET_LTC	2013-08-19 20:09:09 +02:00
video
xen
Kbuild