summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/ethernet.h
diff options
context:
space:
mode:
authorLinus Torvalds2006-10-17 23:46:31 +0200
committerLinus Torvalds2006-10-17 23:46:31 +0200
commit22a60f1951256ed493bf1430f8c3edcb31c0dbaa (patch)
treef32da67f80d89f43177f340de919aed72808bab8 /include/asm-cris/ethernet.h
parentsky2: GMAC pause frame (diff)
parent[ARM] switch to new pci_get_bus_and_slot API (diff)
downloadkernel-qcow2-linux-22a60f1951256ed493bf1430f8c3edcb31c0dbaa.tar.gz
kernel-qcow2-linux-22a60f1951256ed493bf1430f8c3edcb31c0dbaa.tar.xz
kernel-qcow2-linux-22a60f1951256ed493bf1430f8c3edcb31c0dbaa.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] switch to new pci_get_bus_and_slot API [ARM] Update mach-types [ARM] Fix Zaurii keyboard/touchscreen drivers [ARM] Fix fallout from IRQ regs changes [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c [ARM] 3888/1: add pxa27x SSP FSRT register bit definition
Diffstat (limited to 'include/asm-cris/ethernet.h')
0 files changed, 0 insertions, 0 deletions