diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-11 15:43:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-11 15:43:02 -0800 |
| commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
| tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /drivers/firmware | |
| parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | lwn-7e452baf6b96b5aeba097afd91501d33d390cc97.tar.gz lwn-7e452baf6b96b5aeba097afd91501d33d390cc97.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/dmi_scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 3e526b6d00cb..8daf4793ac32 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -81,9 +81,9 @@ static void dmi_table(u8 *buf, int len, int num, const struct dmi_header *dm = (const struct dmi_header *)data; /* - * We want to know the total length (formated area and strings) - * before decoding to make sure we won't run off the table in - * dmi_decode or dmi_string + * We want to know the total length (formatted area and + * strings) before decoding to make sure we won't run off the + * table in dmi_decode or dmi_string */ data += dm->length; while ((data - buf < len - 1) && (data[0] || data[1])) |