diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
| commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
| tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /drivers/staging/ced1401/usb1401.h | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/staging/ced1401/usb1401.h')
| -rw-r--r-- | drivers/staging/ced1401/usb1401.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ced1401/usb1401.h b/drivers/staging/ced1401/usb1401.h index 331ca985982..adb5fa402bd 100644 --- a/drivers/staging/ced1401/usb1401.h +++ b/drivers/staging/ced1401/usb1401.h @@ -165,7 +165,7 @@ typedef struct _DEVICE_EXTENSION // Parameters relating to a block read\write that is in progress. Some of these values // are equivalent to values in rDMAInfo. The values here are those in use, while those - // in rDMAInfo are those recieved from the 1401 via an escape sequence. If another + // in rDMAInfo are those received from the 1401 via an escape sequence. If another // escape sequence arrives before the previous xfer ends, rDMAInfo values are updated while these // are used to finish off the current transfer. volatile short StagedId; // The transfer area id for this transfer |