David S. Miller 86feff3f3e Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch ... Conflicts: net/openvswitch/vport-internal_dev.c Jesse Gross says: ==================== A couple of minor enhancements for net-next/3.10. The largest is an extension to allow variable length metadata to be passed to userspace with packets. There is a merge conflict in net/openvswitch/vport-internal_dev.c: A existing commit modifies internal_dev_mac_addr() and a new commit deletes it. The new one is correct, so you can just remove that function. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-03-17 12:58:47 -04:00
..
acpi	ACPI / glue: Drop .find_bridge() callback from struct acpi_bus_type	2013-03-04 14:23:40 +01:00
asm-generic	ImgTec Meta architecture changes for v3.9-rc1	2013-03-03 12:06:09 -08:00
clocksource	ImgTec Meta architecture changes for v3.9-rc1	2013-03-03 12:06:09 -08:00
crypto
drm	drm: Documentation typo fixes	2013-03-08 08:32:23 +10:00
keys
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch	2013-03-17 12:58:47 -04:00
math-emu
media	[media] media: ov7670: Add possibility to disable pixclk during hblank	2013-02-08 14:35:06 -02:00
memory
misc
net	caif: remove caif_shm	2013-03-17 12:16:38 -04:00
pcmcia
ras	edac: add support for error type "Info"	2013-02-21 14:16:27 -03:00
rdma	IB/core: Add "type 2" memory windows support	2013-02-21 11:51:45 -08:00
rxrpc
scsi	SCSI for-linus on 20130301	2013-03-02 11:42:16 -08:00
sound	arm-soc: late OMAP changes	2013-02-28 20:00:40 -08:00
target	target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors	2013-02-23 12:46:14 -08:00
trace	Various bug fixes for ext4. The most important is a fix for the new	2013-03-02 19:33:21 -08:00
uapi	vxlan: generalize forwarding tables	2013-03-17 12:23:46 -04:00
video	UAPI disintegration 2012-12-20	2013-03-03 14:24:59 -08:00
xen	xen: event channel arrays are xen_ulong_t and not unsigned long	2013-02-20 08:45:07 -05:00
Kbuild