diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-06 03:55:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-06 03:55:55 -0500 |
commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
tree | 9d2690917533bbb4498c8c9df838de2d38360912 /firmware/cis/SW_8xx_SER.cis.ihex | |
parent | 000ba2e43f33901859fd794bb33c885909d53b3b (diff) | |
parent | 887e671f324d9898aaedb29a6ece6c853c394067 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'firmware/cis/SW_8xx_SER.cis.ihex')
-rw-r--r-- | firmware/cis/SW_8xx_SER.cis.ihex | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/firmware/cis/SW_8xx_SER.cis.ihex b/firmware/cis/SW_8xx_SER.cis.ihex new file mode 100644 index 000000000000..bbcfe6348328 --- /dev/null +++ b/firmware/cis/SW_8xx_SER.cis.ihex | |||
@@ -0,0 +1,13 @@ | |||
1 | :100000000101FF17034100FF2004920110072102A4 | ||
2 | :100010000200152F070053696572726120576972DB | ||
3 | :10002000656C657373004143383530003347204EAB | ||
4 | :100030006574776F726B20416461707465720052F1 | ||
5 | :100040003100FF1A0501030007731B10E001197846 | ||
6 | :100050004D555D25A360F8480730BC861B08A101FB | ||
7 | :1000600008A360F847071B08A20108A360E8480737 | ||
8 | :100070001B08A30108A360E847071B04A401082389 | ||
9 | :040080001400FF0069 | ||
10 | :00000001FF | ||
11 | # | ||
12 | # Replacement CIS for AC8xx provided by Sierra Wireless | ||
13 | # | ||