diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /include | |
parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/clk.h | 4 | ||||
-rw-r--r-- | include/linux/mmzone.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/clk.h b/include/linux/clk.h index ad5c43e8ae8a..f6fb40c8bf97 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h | |||
@@ -86,7 +86,7 @@ int clk_notifier_unregister(struct clk *clk, struct notifier_block *nb); | |||
86 | /** | 86 | /** |
87 | * clk_get - lookup and obtain a reference to a clock producer. | 87 | * clk_get - lookup and obtain a reference to a clock producer. |
88 | * @dev: device for clock "consumer" | 88 | * @dev: device for clock "consumer" |
89 | * @id: clock comsumer ID | 89 | * @id: clock consumer ID |
90 | * | 90 | * |
91 | * Returns a struct clk corresponding to the clock producer, or | 91 | * Returns a struct clk corresponding to the clock producer, or |
92 | * valid IS_ERR() condition containing errno. The implementation | 92 | * valid IS_ERR() condition containing errno. The implementation |
@@ -103,7 +103,7 @@ struct clk *clk_get(struct device *dev, const char *id); | |||
103 | /** | 103 | /** |
104 | * devm_clk_get - lookup and obtain a managed reference to a clock producer. | 104 | * devm_clk_get - lookup and obtain a managed reference to a clock producer. |
105 | * @dev: device for clock "consumer" | 105 | * @dev: device for clock "consumer" |
106 | * @id: clock comsumer ID | 106 | * @id: clock consumer ID |
107 | * | 107 | * |
108 | * Returns a struct clk corresponding to the clock producer, or | 108 | * Returns a struct clk corresponding to the clock producer, or |
109 | * valid IS_ERR() condition containing errno. The implementation | 109 | * valid IS_ERR() condition containing errno. The implementation |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 68c569fcbb66..458988bd55a1 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -188,7 +188,7 @@ static inline int is_unevictable_lru(enum lru_list lru) | |||
188 | struct zone_reclaim_stat { | 188 | struct zone_reclaim_stat { |
189 | /* | 189 | /* |
190 | * The pageout code in vmscan.c keeps track of how many of the | 190 | * The pageout code in vmscan.c keeps track of how many of the |
191 | * mem/swap backed and file backed pages are refeferenced. | 191 | * mem/swap backed and file backed pages are referenced. |
192 | * The higher the rotated/scanned ratio, the more valuable | 192 | * The higher the rotated/scanned ratio, the more valuable |
193 | * that cache is. | 193 | * that cache is. |
194 | * | 194 | * |