David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
acpi	Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base	2012-08-03 00:31:23 -04:00
asm-generic	syscalls: add __NR_kcmp syscall to generic unistd.h	2012-09-26 15:26:30 -04:00
crypto
drm	drm: Drop the NV12M and YUV420M formats	2012-09-13 12:38:10 +09:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
math-emu
media	[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl	2012-07-30 20:23:05 -03:00
memory
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus	2012-07-22 23:26:17 -07:00
rxrpc
scsi	scsi_netlink: Remove dead and buggy code	2012-09-13 16:26:39 -04:00
sound	ASoC: Additional updates for 3.6	2012-08-20 21:26:04 +02:00
target	target: support zero allocation length in REQUEST SENSE	2012-09-07 11:14:21 -07:00
trace	tracing: Don't call page_to_pfn() if page is NULL	2012-09-20 15:51:16 -04:00
video	video: da8xx-fb: configure FIFO threshold to reduce underflow errors	2012-07-29 01:11:09 +00:00
xen	xen/m2p: do not reuse kmap_op->dev_bus_addr	2012-09-12 11:21:40 -04:00
Kbuild