summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/vsyscall.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 06:24:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-24 06:24:07 +0200
commitd762f4383100c2a87b1a3f2d678cd3b5425655b4 (patch)
treee2a982fea165e77d3f7098717e887dbb28efc6d1 /arch/x86/include/asm/vsyscall.h
parentMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentsh: Ignore R_SH_NONE module relocations. (diff)
downloadlinux-d762f4383100c2a87b1a3f2d678cd3b5425655b4.tar.xz
linux-d762f4383100c2a87b1a3f2d678cd3b5425655b4.zip
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits) sh: Ignore R_SH_NONE module relocations. SH: SE7751: Fix pcibios_map_platform_irq prototype. sh: remove warning and warning_symbol from struct stacktrace_ops sh: wire up sys_sendmmsg. clocksource: sh_tmu: Runtime PM support clocksource: sh_tmu: __clocksource_updatefreq_hz() update clocksource: sh_cmt: Runtime PM support clocksource: sh_cmt: __clocksource_updatefreq_hz() update dmaengine: shdma: synchronize RCU before freeing, simplify spinlock dmaengine: shdma: add runtime- and system-level power management dmaengine: shdma: fix locking sh: sh-sci: sh7377 and sh73a0 build fixes sh: cosmetic improvement: use an existing pointer serial: sh-sci: suspend/resume wakeup support V2 serial: sh-sci: Runtime PM support sh: select IRQ_FORCED_THREADING. sh: intc: Set virtual IRQs as nothread. sh: fixup fpu.o compile order i2c: add a module alias to the sh-mobile driver ALSA: add a module alias to the FSI driver ...
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
0 files changed, 0 insertions, 0 deletions