diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 15:26:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 15:26:43 -0700 |
| commit | 71ba22fa739029bb158144813b9e82c00326497c (patch) | |
| tree | cca33deab3b79b38e15e6b3f7d7f9dfbf7ab32a2 /drivers/ide/arm/icside.c | |
| parent | 27a278aa4309df244a2619f47031acce00ca1b7c (diff) | |
| parent | f2ec8030085a27c4ba8e95a10a96f248efb34177 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (75 commits)
Ethernet driver for EISA only SNI RM200/RM400 machines
Extract chip specific code out of lasi_82596.c
ehea: Whitespace cleanup
pasemi_mac: Fix TX interrupt threshold
spidernet: Replace literal with const
r8169: perform RX config change after mac filtering
r8169: mac address change support
r8169: display some extra debug information during startup
r8169: add endianess annotations to [RT]xDesc
r8169: align the IP header when there is no DMA constraint
r8169: add bit description for the TxPoll register
r8169: cleanup
r8169: remove the media option
r8169: small 8101 comment
r8169: confusion between hardware and IP header alignment
r8169: merge with version 8.001.00 of Realtek's r8168 driver
r8169: merge with version 6.001.00 of Realtek's r8169 driver
r8169: prettify mac_version
r8169: populate the hw_start handler for the 8110
r8169: populate the hw_start handler for the 8168
...
Diffstat (limited to 'drivers/ide/arm/icside.c')
0 files changed, 0 insertions, 0 deletions