Changeset 7943c43 in mainline for uspace/drv/nic/e1k/e1k.ma


Ignore:
Timestamp:
2012-01-16T22:45:38Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32817cc, 3fe58d3c
Parents:
9117ef9b (diff), 3ea725e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/nic/e1k/e1k.ma

    r9117ef9b r7943c43  
    222210 pci/ven=8086&dev=107b
    232310 pci/ven=8086&dev=107c
    24 10 pci/ven=8086&dev=1107
    25 10 pci/ven=8086&dev=1112
     2410 pci/ven=8086&dev=1096
    262510 pci/ven=8086&dev=10b9
Note: See TracChangeset for help on using the changeset viewer.