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

diff --git a/WHENCE b/WHENCE
index 1bb2cf4b17354f022c21a19160558c3ca2a57ca7..8b5651347791c4c69b180ec119a40d9f754571af 100644 (file)
--- 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 (file)
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 (file)
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 (file)
index 0000000..3cfc65b
Binary files /dev/null and b/e100/d102e_ucode.bin differ