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

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

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

2015-07-13 17:28:09 -07:00

..

asm-generic

errno.h: Improve ENOSYS's comment

2015-04-17 09:03:58 -04:00

drm

Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux

2015-07-02 14:38:15 -07:00

linux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-07-13 17:28:09 -07:00

misc

cxl: Implement an ioctl to fetch afu card-id, offset-id and mode

2015-06-03 13:27:15 +10:00

mtd

…

rdma

IB/core: Add timestamp_mask and hca_core_clock to query_device

2015-06-12 14:49:10 -04:00

scsi

…

sound

ALSA: topology: Export ID types for TLV controls.

2015-06-04 09:40:03 +01:00

video

…

xen

…

Kbuild

…