dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse Source 
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
  ...
This commit is contained in:
Linus Torvalds
2014-10-07 21:16:26 -04:00
parent b6420ebd4a 7bb38d57fd
commit 28596c9722
92 changed files with 125 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/misc/mei/pci-me.c
+2 -2
View File
@@ -424,7 +424,7 @@ static int mei_me_pm_runtime_resume(struct device *device)
}
/**
* mei_me_set_pm_domain - fill and set pm domian stucture for device
* mei_me_set_pm_domain - fill and set pm domain structure for device
*
* @dev: mei_device
*/
@@ -444,7 +444,7 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev)
}
/**
* mei_me_unset_pm_domain - clean pm domian stucture for device
* mei_me_unset_pm_domain - clean pm domain structure for device
*
* @dev: mei_device
*/
drivers/misc/mei/pci-txe.c
+2 -2
View File
@@ -371,7 +371,7 @@ static int mei_txe_pm_runtime_resume(struct device *device)
}
/**
* mei_txe_set_pm_domain - fill and set pm domian stucture for device
* mei_txe_set_pm_domain - fill and set pm domain structure for device
*
* @dev: mei_device
*/
@@ -391,7 +391,7 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev)
}
/**
* mei_txe_unset_pm_domain - clean pm domian stucture for device
* mei_txe_unset_pm_domain - clean pm domain structure for device
*
* @dev: mei_device
*/