diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2013-05-01 10:48:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2013-05-01 10:48:34 -0700 |
| commit | 8a72f3820c4d14b27ad5336aed00063a7a7f1bef (patch) | |
| tree | c6806e79915ce5c04a7f2574208c4b2f179dd7b2 /net/netfilter/xt_LOG.c | |
| parent | init: Do not warn on non-zero initcall return (diff) | |
| parent | arch/tile: Fix syscall return value passed to tracepoint (diff) | |
| download | linux-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.tar.gz linux-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.tar.bz2 linux-8a72f3820c4d14b27ad5336aed00063a7a7f1bef.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile arch changes from Chris Metcalf:
"These are some minor new feature work and other changes that didn't
merit getting pushed up after the 3.9 merge window closed.
There should be a lot more activity in the 3.11 merge window"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
arch/tile: Fix syscall return value passed to tracepoint
tile: comment assumption about __insn_mtspr for <asm/irqflags.h>
tile: ns2cycles should use __raw_get_cpu_var
arch: remove KCORE_ELF again [tile]
tile: remove two outdated Kconfig entries
tile: support atomic64_dec_if_positive()
tile: support TIF_SYSCALL_TRACEPOINT; select HAVE_SYSCALL_TRACEPOINTS
tile: Add definition of NR_syscalls
tile: move declaration of sys_call_table to <asm/syscall.h>
arch/tile: Enable HAVE_ARCH_TRACEHOOK
arch/tile: Call tracehook_report_syscall_{entry,exit} in syscall trace
Diffstat (limited to 'net/netfilter/xt_LOG.c')
0 files changed, 0 insertions, 0 deletions