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

Conflicts: WHENCE
2010-04-07 17:46:02 +01:00 · 2010-04-07 17:46:02 +01:00 · 726025e8df
parent 8c3ff02adf a9799c6dbb
commit 726025e8df
4 changed files with 9 additions and 0 deletions
--- 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/9
+++ b/9
@ -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.
+
+--------------------------------------------------------------------------