summaryrefslogtreecommitdiff
path: root/firmware/WHENCE
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-31 10:31:57 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-31 10:31:57 +0300
commita9de18eb761f7c1c860964b2e5addc1a35c7e861 (patch)
tree886e75fdfd09690cd262ca69cb7f5d1d42b48602 /firmware/WHENCE
parentb2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (diff)
parent6a94cb73064c952255336cc57731904174b2c58f (diff)
downloadlinux-a9de18eb761f7c1c860964b2e5addc1a35c7e861.tar.xz
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/include/asm/pda.h kernel/fork.c
Diffstat (limited to 'firmware/WHENCE')
-rw-r--r--firmware/WHENCE11
1 files changed, 11 insertions, 0 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE
index 57002cdecd42..8f06639ba3e7 100644
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -349,3 +349,14 @@ Licence: Unknown
Found in hex form in kernel source.
--------------------------------------------------------------------------
+
+Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+
+File: cxgb3/t3b_psram-1.1.0.bin.ihex
+File: cxgb3/t3c_psram-1.1.0.bin.ihex
+file: cxgb3/t3fw-7.0.0.bin.ihex
+
+License: GPLv2 or OpenIB.org BSD license, no source visible
+
+--------------------------------------------------------------------------
+