From: David S. Miller <davem@davemloft.net>
Date: Thu, 8 Jan 2009 19:05:59 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa05f6a1ebe98f654c67908d65959a0ab2adbd89;hp=8d38084891b49ad84697301e0cd4d0c54bbbe91f;p=linux-firmware

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

diff --git a/WHENCE b/WHENCE
index 1bb2cf4..8b56513 100644
--- a/WHENCE
+++ b/WHENCE
@@ -360,6 +360,18 @@ License: GPLv2 or OpenIB.org BSD license, no source visible
 
 --------------------------------------------------------------------------
 
+Driver: e100 -- Intel PRO/100 Ethernet NIC
+
+File: e100/d101m_ucode.bin
+File: e100/d101s_ucode.bin
+File: e100/d102e_ucode.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
 Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
 
 File: acenic/tg1.bin
diff --git a/e100/d101m_ucode.bin b/e100/d101m_ucode.bin
new file mode 100644
index 0000000..b700b75
Binary files /dev/null and b/e100/d101m_ucode.bin differ
diff --git a/e100/d101s_ucode.bin b/e100/d101s_ucode.bin
new file mode 100644
index 0000000..d869e06
Binary files /dev/null and b/e100/d101s_ucode.bin differ
diff --git a/e100/d102e_ucode.bin b/e100/d102e_ucode.bin
new file mode 100644
index 0000000..3cfc65b
Binary files /dev/null and b/e100/d102e_ucode.bin differ