From: Linus Torvalds Date: Sun, 2 Nov 2008 18:16:44 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.28-rc3~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0bf82cccd1e17135f880c161bc7926f5b25df34c;p=linux-2.6-omap-h63xx.git 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. --- 0bf82cccd1e17135f880c161bc7926f5b25df34c