diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 12:14:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 12:14:44 -0700 |
commit | db217dece3003df0841bacf9556b5c06aa097dae (patch) | |
tree | 08612e7696c04c4d8fc2207c3ccf2356f945d230 /kernel/trace/ring_buffer.c | |
parent | 8ce42c8b7fdf4fc008a6fc7349beb8f4dd5cb774 (diff) | |
parent | bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sunxvr500: Ignore secondary output PCI devices.
sparc64: Implement perf_arch_fetch_caller_regs
sparc64: Update defconfig.
sparc64: Fix array size reported by vmemmap_populate()
sparc: Fix regset register window handling.
drivers/serial/sunsu.c: Correct use after free
Diffstat (limited to 'kernel/trace/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions