diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 09:20:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-20 09:20:55 -0700 |
| commit | ac8bf564307962a763a52b34e771205c58b76ec8 (patch) | |
| tree | 851fe4ebd22cca979744dace54a8d628143bbc4b /Documentation/networking/timestamping.txt | |
| parent | 34388d1c4feae50d61d6f4ec7594b9076d6d24db (diff) | |
| parent | 28a1f533ae8606020238b840b82ae70a3f87609e (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:
sparc64: Fix hardirq tracing in trap return path.
sparc64: Use correct pt_regs in decode_access_size() error paths.
sparc64: Fix PREEMPT_ACTIVE value.
sparc64: Run NMIs on the hardirq stack.
sparc64: Allocate sufficient stack space in ftrace stubs.
sparc: Fix forgotten kmemleak headers inclusion
Diffstat (limited to 'Documentation/networking/timestamping.txt')
0 files changed, 0 insertions, 0 deletions