diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-11 01:55:03 -0500 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /firmware/cis/PE520.cis.ihex | |
| parent | bdbec4b86ee99b020e159f9bd604003a3ae3b0ab (diff) | |
| parent | fa15e99b6bb44aa86b241a43ca8c509e91f80153 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
Diffstat (limited to 'firmware/cis/PE520.cis.ihex')
| -rw-r--r-- | firmware/cis/PE520.cis.ihex | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/firmware/cis/PE520.cis.ihex b/firmware/cis/PE520.cis.ihex new file mode 100644 index 000000000000..97a745b5496e --- /dev/null +++ b/firmware/cis/PE520.cis.ihex | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | :1000000001030000FF152304014B544900504535FE | ||
| 2 | :10001000323020504C55530050434D434941204508 | ||
| 3 | :10002000746865726E65740000FF20046101100041 | ||
| 4 | :10003000210206001A050101D00F0B1B09C101198D | ||
| 5 | :0A00400001556530FFFF1400FF00BA | ||
| 6 | :00000001FF | ||
| 7 | # | ||
| 8 | # Replacement CIS for PE520 ethernet card | ||
| 9 | # | ||