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

Conflicts: WHENCE

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/firmware
Conflicts: WHENCE
726025e8 · David Woodhouse · 8c3ff02a · a9799c6d · 726025e8 · 726025e8
Commit 726025e8 authored Apr 07, 2010 by David Woodhouse
--- a/RTL8192E/boot.img
+++ b/RTL8192E/boot.img
--- a/RTL8192E/data.img
+++ b/RTL8192E/data.img
--- a/RTL8192E/main.img
+++ b/RTL8192E/main.img
--- 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.
+--------------------------------------------------------------------------