Changeset dffabf0 in mainline for uspace/srv/net/cfg/ne2k.netif_standalone

Timestamp:

2011-01-05T19:08:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (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

Conflicts: no problem solving.
Added new apps to ignore list.

File:

• uspace/srv/net/cfg/ne2k.netif_standalone (modified) (1 diff)

uspace/srv/net/cfg/ne2k.netif_standalone

@@ -7 +7 @@
 IL=ip
 
-IRQ=9
+IRQ=5
 IO=300