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 (file)
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 (file)
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 (file)
index 0000000..7703afd
Binary files /dev/null and b/RTL8192E/main.img differ

diff --git a/WHENCE b/WHENCE
index e38d34efeace8b5a281a026d44d6cbc59bbb6973..8b1bb5f21e7f7b03f4ff7b3a9ce6ab23047af2ac 100644 (file)
--- 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.
+
+--------------------------------------------------------------------------