From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 7 Apr 2010 16:46:02 +0000 (+0100)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=726025e8df38178ceb1f7b6a70699795cf75e368;hp=8c3ff02adff5f8d492535ae78bf294b5c06baeac;p=linux-firmware

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware

Conflicts:
	WHENCE
---

diff --git a/RTL8192E/boot.img b/RTL8192E/boot.img
new file mode 100644
index 0000000..16998bb
Binary files /dev/null and b/RTL8192E/boot.img differ
diff --git a/RTL8192E/data.img b/RTL8192E/data.img
new file mode 100644
index 0000000..4cabc4a
Binary files /dev/null and b/RTL8192E/data.img differ
diff --git a/RTL8192E/main.img b/RTL8192E/main.img
new file mode 100644
index 0000000..7703afd
Binary files /dev/null and b/RTL8192E/main.img differ
diff --git a/WHENCE b/WHENCE
index e38d34e..8b1bb5f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1208,3 +1208,12 @@ Licence:
   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+--------------------------------------------------------------------------
+
+Driver rtl8192e - Realtek 8192 PCI wireless driver
+
+Files: RTL8192E/*
+Licence: Redistributable, provided by Realtek in their driver
+         source download.
+
+--------------------------------------------------------------------------