diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
| commit | 28596c9722289b2f98fa83a2e4351eb0a031b953 (patch) | |
| tree | f1a76a8a2604ac710bad28e3ad1b5976601c82d4 /drivers/misc | |
| parent | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (diff) | |
| parent | 7bb38d57fd75f03753a5b362916c5bbde8290208 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina:
"Usual pile from trivial tree everyone is so eagerly waiting for"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Remove MN10300_PROC_MN2WS0038
mei: fix comments
treewide: Fix typos in Kconfig
kprobes: update jprobe_example.c for do_fork() change
Documentation: change "&" to "and" in Documentation/applying-patches.txt
Documentation: remove obsolete pcmcia-cs from Changes
Documentation: update links in Changes
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
score: Remove GENERIC_HAS_IOMAP
gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
tty: doc: Fix grammar in serial/tty
dma-debug: modify check_for_stack output
treewide: fix errors in printk
genirq: fix reference in devm_request_threaded_irq comment
treewide: fix synchronize_rcu() in comments
checkstack.pl: port to AArch64
doc: queue-sysfs: minor fixes
init/do_mounts: better syntax description
MIPS: fix comment spelling
powerpc/simpleboot: fix comment
...
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index a0e9422b55a2..959c313d84a7 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c | |||
| @@ -424,7 +424,7 @@ static int mei_me_pm_runtime_resume(struct device *device) | |||
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | /** | 426 | /** |
| 427 | * mei_me_set_pm_domain - fill and set pm domian stucture for device | 427 | * mei_me_set_pm_domain - fill and set pm domain structure for device |
| 428 | * | 428 | * |
| 429 | * @dev: mei_device | 429 | * @dev: mei_device |
| 430 | */ | 430 | */ |
| @@ -444,7 +444,7 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev) | |||
| 444 | } | 444 | } |
| 445 | 445 | ||
| 446 | /** | 446 | /** |
| 447 | * mei_me_unset_pm_domain - clean pm domian stucture for device | 447 | * mei_me_unset_pm_domain - clean pm domain structure for device |
| 448 | * | 448 | * |
| 449 | * @dev: mei_device | 449 | * @dev: mei_device |
| 450 | */ | 450 | */ |
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index 19de57368b7a..74727dda51c1 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c | |||
| @@ -371,7 +371,7 @@ static int mei_txe_pm_runtime_resume(struct device *device) | |||
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | /** | 373 | /** |
| 374 | * mei_txe_set_pm_domain - fill and set pm domian stucture for device | 374 | * mei_txe_set_pm_domain - fill and set pm domain structure for device |
| 375 | * | 375 | * |
| 376 | * @dev: mei_device | 376 | * @dev: mei_device |
| 377 | */ | 377 | */ |
| @@ -391,7 +391,7 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev) | |||
| 391 | } | 391 | } |
| 392 | 392 | ||
| 393 | /** | 393 | /** |
| 394 | * mei_txe_unset_pm_domain - clean pm domian stucture for device | 394 | * mei_txe_unset_pm_domain - clean pm domain structure for device |
| 395 | * | 395 | * |
| 396 | * @dev: mei_device | 396 | * @dev: mei_device |
| 397 | */ | 397 | */ |