David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-26 16:37:08 -04:00
..
asm-generic	allow O_TMPFILE to work with O_WRONLY	2013-07-20 03:11:32 +04:00
drm	Merge branch 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux into drm-next	2013-06-28 09:29:04 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
mtd	UBI: document UBI_IOCVOLUP better in user header	2013-05-29 15:19:26 +03:00
rdma	RDMA/ucma: Allow user space to specify AF_IB when joining multicast	2013-06-20 23:35:45 -07:00
scsi	FCoE Updates for 3.9	2013-03-01 09:10:08 +00:00
sound	ALSA: Replace the magic number 44 with const	2013-06-28 12:14:44 +02:00
video	UAPI: (Scripted) Disintegrate include/video	2012-12-20 17:14:26 +00:00
xen	UAPI: (Scripted) Disintegrate include/xen	2012-10-09 09:49:15 +01:00
Kbuild