diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 20:21:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 20:21:04 +0000 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /firmware/WHENCE | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'firmware/WHENCE')
| -rw-r--r-- | firmware/WHENCE | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE index ac174feda7c..e8e550fa242 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. |