diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 21:14:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-04 21:14:44 +0200 |
commit | db217dece3003df0841bacf9556b5c06aa097dae (patch) | |
tree | 08612e7696c04c4d8fc2207c3ccf2356f945d230 /fs/logfs/journal.c | |
parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | sunxvr500: Ignore secondary output PCI devices. (diff) | |
download | linux-db217dece3003df0841bacf9556b5c06aa097dae.tar.xz linux-db217dece3003df0841bacf9556b5c06aa097dae.zip |
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 'fs/logfs/journal.c')
0 files changed, 0 insertions, 0 deletions