]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c144879 6cf431d)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Oct 2006 17:27:55 +0000 (10:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Oct 2006 17:27:55 +0000 (10:27 -0700)
commitd2c5f06e361f18be0d7b75988ce6a9e8800a8113
tree3e49fffc05e1d7aa1413ffcdc1dcb41521fd0875tree | snapshot
parentc1448791648d44ecbf8cadb192704e3e6eb3bb0ecommit | diff
parent6cf431d77c3e917399a847e3a7ec239d5163056bcommit | diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Clean up asm-sparc/elf.h pollution in userspace.
  [SPARC64]: Fix of_ioremap().
  [SPARC64]: Compute dma_end argument to sabre_pbm_init() correctly.
Linux 2.6 source tree