diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
| commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
| tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers/power | |
| parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/s3c_adc_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index fe16b482e912..4a8ae3935b3b 100644 --- a/drivers/power/s3c_adc_battery.c +++ b/drivers/power/s3c_adc_battery.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * iPAQ h1930/h1940/rx1950 battery controler driver | 2 | * iPAQ h1930/h1940/rx1950 battery controller driver |
| 3 | * Copyright (c) Vasily Khoruzhick | 3 | * Copyright (c) Vasily Khoruzhick |
| 4 | * Based on h1940_battery.c by Arnaud Patard | 4 | * Based on h1940_battery.c by Arnaud Patard |
| 5 | * | 5 | * |
| @@ -427,5 +427,5 @@ static void __exit s3c_adc_bat_exit(void) | |||
| 427 | module_exit(s3c_adc_bat_exit); | 427 | module_exit(s3c_adc_bat_exit); |
| 428 | 428 | ||
| 429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); | 429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); |
| 430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controler driver"); | 430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver"); |
| 431 | MODULE_LICENSE("GPL"); | 431 | MODULE_LICENSE("GPL"); |