diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 19:16:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-02 19:16:44 +0100 |
| commit | 0bf82cccd1e17135f880c161bc7926f5b25df34c (patch) | |
| tree | 45935237f81b08d34f52c7bf5fe8d3d3c6a8b11b /kernel/tracepoint.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | sparc64: Fix PCI resource mapping on sparc64 (diff) | |
| download | linux-0bf82cccd1e17135f880c161bc7926f5b25df34c.tar.xz linux-0bf82cccd1e17135f880c161bc7926f5b25df34c.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:
sparc64: Fix PCI resource mapping on sparc64
sparc64: Kill annoying warning when building compat_binfmt_elf.o
sparc32: kernel/trace/trace.c wants DIE_OOPS
sparc64: Fix __copy_{to,from}_user_inatomic defines.
Diffstat (limited to 'kernel/tracepoint.c')
0 files changed, 0 insertions, 0 deletions