David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 18:46:26 -07:00
..
acpi	ACPI / i915: ignore firmware requests for backlight change	2014-07-07 23:38:05 +02:00
asm-generic	core: fix typo in percpu read_mostly section	2014-07-01 16:45:22 -04:00
clocksource
crypto
drm	sound fixes for 3.16-rc4	2014-07-04 08:56:57 -07:00
dt-bindings	Two regression fixes for omaps and one fix for device signaling:	2014-07-24 14:06:33 +02:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
math-emu
media	Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-06-12 23:04:28 -07:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
pcmcia
ras
rdma	Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-06-10 10:12:14 -07:00
rxrpc
scsi	SCSI for-linus on 20140705	2014-07-06 12:08:30 -07:00
sound	ALSA: control: Protect user controls against concurrent access	2014-06-18 15:12:33 +02:00
target	target: Report correct response length for some commands	2014-06-11 12:15:30 -07:00
trace	tracing: Add __field_struct macro for TRACE_EVENT()	2014-06-21 00:18:42 -04:00
uapi	net-timestamp: ACK timestamp for bytestreams	2014-08-05 16:35:54 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-06-12 11:32:30 -07:00
xen	Fix BUG when trying to expand the grant table. This seems to occur	2014-07-30 09:00:20 -07:00
Kbuild