diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-28 14:02:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-28 14:02:37 +1000 |
| commit | 5ea05de9f2e3eb247648a3f15032f1777f1e6d4b (patch) | |
| tree | 13e6ebc3e5266b7dc4f92c14a6d74320d7ade8ec /drivers/staging/vt6656/power.h | |
| parent | 887534f673c010693d213184c2b34e0a2f483211 (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
Diffstat (limited to 'drivers/staging/vt6656/power.h')
| -rw-r--r-- | drivers/staging/vt6656/power.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/power.h b/drivers/staging/vt6656/power.h index 50792bb8c978..41bffe528b44 100644 --- a/drivers/staging/vt6656/power.h +++ b/drivers/staging/vt6656/power.h @@ -18,7 +18,7 @@ * * File: power.h * - * Purpose: Handles 802.11 power managment functions + * Purpose: Handles 802.11 power management functions * * Author: Lyndon Chen * |