diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:19:01 +0200 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-12 23:20:33 +0200 |
commit | a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94 (patch) | |
tree | 1f9d19f1642d263e65906a916a48be9339accc73 /firmware/WHENCE | |
parent | nmi_watchdog: Tell the world we're active (diff) | |
parent | Linux 2.6.34-rc7 (diff) | |
download | linux-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.tar.xz linux-a9aa1d02de36b450990b0e25a88fc2ff1c3e6b94.zip |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
Diffstat (limited to '')
-rw-r--r-- | firmware/WHENCE | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE index ac174feda7cb..e8e550fa2423 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE @@ -679,11 +679,11 @@ Found in hex form in kernel source. Driver: bnx2x: Broadcom Everest -File: bnx2x-e1-5.2.7.0.fw.ihex -File: bnx2x-e1h-5.2.7.0.fw.ihex +File: bnx2x-e1-5.2.13.0.fw +File: bnx2x-e1h-5.2.13.0.fw License: - Copyright (c) 2007-2009 Broadcom Corporation + Copyright (c) 2007-2010 Broadcom Corporation This file contains firmware data derived from proprietary unpublished source code, Copyright (c) 2007-2009 Broadcom Corporation. |