diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 07:03:34 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 07:03:34 +0200 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/eisa/eisa-bus.c | |
| parent | [PATCH] bonding: inherit zero-copy flags of slaves (diff) | |
| parent | Linux v2.6.13-rc7 (diff) | |
| download | linux-75a95178dafb5c8d69b4abe45ea746a9cea23142.tar.xz linux-75a95178dafb5c8d69b4abe45ea746a9cea23142.zip | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'drivers/eisa/eisa-bus.c')
0 files changed, 0 insertions, 0 deletions