diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 14:46:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 14:46:31 -0700 |
| commit | 22a60f1951256ed493bf1430f8c3edcb31c0dbaa (patch) | |
| tree | f32da67f80d89f43177f340de919aed72808bab8 /drivers/net | |
| parent | 4e4bc305e16440ab38060d61fbcb7d774881d2f1 (diff) | |
| parent | 7281c248f797723f66244b7ecef204620f664648 (diff) | |
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 'drivers/net')
0 files changed, 0 insertions, 0 deletions