]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a11addf 34a96ba)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 17:29:39 +0000 (09:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 17:29:39 +0000 (09:29 -0800)
commitaa8af268c8726913deb0d9162705a4ecd057271d
tree6d0ffd38855ffe3710a05b169587438447ebebc0tree | snapshot
parenta11addf293c046c7755eb8bdd2117015f8e1cc3acommit | diff
parent34a96bac459675477f397a93ff106008a5ef5b71commit | 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]: Make use of the new fs/compat_binfmt_elf.c
  [SPARC64]: Make use of compat_sys_ptrace()

Manually fixed trivial delete/modift conflict in arch/sparc64/kernel/binfmt_elf32.c
arch/sparc64/Kconfig diff1 | diff2 | blob | history
Linux Kernel Source Tree.