diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /firmware/WHENCE | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'firmware/WHENCE')
| -rw-r--r-- | firmware/WHENCE | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE index 7a8adc06eb34..e8e550fa2423 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE | |||
| @@ -601,6 +601,7 @@ File: cis/LA-PCM.cis | |||
| 601 | cis/NE2K.cis | 601 | cis/NE2K.cis |
| 602 | cis/tamarack.cis | 602 | cis/tamarack.cis |
| 603 | cis/PE-200.cis | 603 | cis/PE-200.cis |
| 604 | cis/PE520.cis | ||
| 604 | 605 | ||
| 605 | Licence: GPL | 606 | Licence: GPL |
| 606 | 607 | ||
| @@ -678,11 +679,11 @@ Found in hex form in kernel source. | |||
| 678 | 679 | ||
| 679 | Driver: bnx2x: Broadcom Everest | 680 | Driver: bnx2x: Broadcom Everest |
| 680 | 681 | ||
| 681 | File: bnx2x-e1-4.8.53.0.fw.ihex | 682 | File: bnx2x-e1-5.2.13.0.fw |
| 682 | File: bnx2x-e1h-4.8.53.0.fw.ihex | 683 | File: bnx2x-e1h-5.2.13.0.fw |
| 683 | 684 | ||
| 684 | License: | 685 | License: |
| 685 | Copyright (c) 2007-2009 Broadcom Corporation | 686 | Copyright (c) 2007-2010 Broadcom Corporation |
| 686 | 687 | ||
| 687 | This file contains firmware data derived from proprietary unpublished | 688 | This file contains firmware data derived from proprietary unpublished |
| 688 | source code, Copyright (c) 2007-2009 Broadcom Corporation. | 689 | source code, Copyright (c) 2007-2009 Broadcom Corporation. |