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

Conflicts:
	WHENCE
This commit is contained in:
David Woodhouse
2010-04-07 17:46:02 +01:00
4 changed files with 9 additions and 0 deletions

9
WHENCE
View File

@@ -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.
--------------------------------------------------------------------------