| commit | 0bf82cccd1e17135f880c161bc7926f5b25df34c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 02 10:16:44 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 02 10:16:44 2008 -0800 |
| tree | 45935237f81b08d34f52c7bf5fe8d3d3c6a8b11b | |
| parent | 391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 [diff] | |
| parent | 5769907ade8dda7002b304c03ef9e4ee5c1e0821 [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 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.