summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-02 10:16:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-02 10:16:44 -0800
commit0bf82cccd1e17135f880c161bc7926f5b25df34c (patch)
tree45935237f81b08d34f52c7bf5fe8d3d3c6a8b11b /security
parent391e572cd1a63aee9c8d4c2d5e3dada91d86bc43 (diff)
parent5769907ade8dda7002b304c03ef9e4ee5c1e0821 (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.
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions