David S. Miller 82f437b950 Merge branch 'master' of git://1984.lsi.us.es/nf-next ... Pablo says: ==================== This is the second batch of Netfilter updates for net-next. It contains the kernel changes for the new user-space connection tracking helper infrastructure. More details on this infrastructure are provides here: http://lwn.net/Articles/500196/ Still, I plan to provide some official documentation through the conntrack-tools user manual on how to setup user-space utilities for this. So far, it provides two helper in user-space, one for NFSv3 and another for Oracle/SQLnet/TNS. Yet in my TODO list. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-16 15:23:35 -07:00
..
acpi	ACPI: fix acpi_bus.h build warnings when ACPI is not enabled	2012-06-04 00:29:11 -04:00
asm-generic	Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus	2012-06-13 12:01:33 +09:00
crypto
drm	drm: increase DRM_OBJECT_MAX_PROPERTY to 24	2012-06-12 15:36:31 +01:00
keys
linux	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2012-06-16 15:23:35 -07:00
math-emu
media	[media] patch for Asus My Cinema PS3-100 (1043:48cd)	2012-05-20 16:05:02 -03:00
memory
misc
mtd	UBI: amend commentaries WRT dtype	2012-05-20 20:25:59 +03:00
net	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2012-06-16 15:23:35 -07:00
pcmcia
rdma	Merge branches 'core', 'cxgb4', 'ipath', 'iser', 'lockdep', 'mlx4', 'nes', 'ocrdma', 'qib' and 'raw-qp' into for-linus	2012-05-21 09:00:47 -07:00
rxrpc
scsi	[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs	2012-05-23 09:43:13 +01:00
sound	ASoC: Last minute updates	2012-05-22 02:58:55 +02:00
target
trace	mm: vmscan: remove reclaim_mode_t	2012-05-29 16:22:19 -07:00
video	fbdev updates for 3.5	2012-06-01 16:57:51 -07:00
xen	xen: do not map the same GSI twice in PVHVM guests.	2012-05-21 14:11:36 -04:00
Kbuild