| commit | d2c5f06e361f18be0d7b75988ce6a9e8800a8113 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 20 10:27:55 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 20 10:27:55 2006 -0700 |
| tree | 3e49fffc05e1d7aa1413ffcdc1dcb41521fd0875 | |
| parent | c1448791648d44ecbf8cadb192704e3e6eb3bb0e [diff] | |
| parent | 6cf431d77c3e917399a847e3a7ec239d5163056b [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.