diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 04:04:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-23 04:04:22 +0200 |
| commit | e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210 (patch) | |
| tree | f1a5479b435879d6d0e5acfcdbbc2fb7b92bb183 /drivers/net | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | sparc32: pass -m32 when building vmlinux.lds (diff) | |
| download | linux-e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210.tar.xz linux-e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210.zip | |
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:
sparc32: pass -m32 when building vmlinux.lds
sparc: Fixes the DRM layer build on sparc.
ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>
ide: <asm-sparc/ide_64.h>: use __raw_{read,write}w()
ide: <asm-sparc/ide_32.h>: use __raw_{read,write}w()
ide: <asm-sparc/ide_64.h>: use %r0 for outw_be()
sparc64: Do not define BIO_VMERGE_BOUNDARY.
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions