Patrick McHardy 2f1e317672 netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n ... net/built-in.o: In function `nf_conntrack_init_net': net/netfilter/nf_conntrack_core.c:1521: undefined reference to `nf_conntrack_tstamp_init' net/netfilter/nf_conntrack_core.c:1531: undefined reference to `nf_conntrack_tstamp_fini' Add dummy inline functions for the =n case to fix this. Reported-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: Patrick McHardy <kaber@trash.net>		2011-01-20 20:46:52 +01:00
..
acpi	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-01-14 09:29:05 -08:00
asm-generic	fix non-x86 build failure in pmdp_get_and_clear	2011-01-16 15:05:44 -08:00
crypto	crypto: padlock - Move padlock.h into include/crypto	2011-01-07 14:52:00 +11:00
drm	Revert "drm: Update fbdev fb_fix_screeninfo"	2011-01-14 16:10:28 -08:00
keys
linux	netfilter: xtables: add missing header inclusions for headers_check	2011-01-20 17:50:17 +01:00
math-emu
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
mtd
net	netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n	2011-01-20 20:46:52 +01:00
pcmcia
rdma	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
rxrpc
scsi	Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block	2011-01-13 10:45:01 -08:00
sound	ALSA: constify functions in ac97	2011-01-14 19:14:47 +01:00
target	[SCSI] target: Add LIO target core v4.0.0-rc6	2011-01-14 10:12:29 -06:00
trace	Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-15 12:45:00 -08:00
video	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
xen	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
Kbuild