From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 20:34:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d14b7a419a664cd7c1c585c9e7fffee9e9051d53;p=~shefty%2Frdma-dev.git

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
  ...
---

d14b7a419a664cd7c1c585c9e7fffee9e9051d53
diff --cc drivers/net/wireless/iwlwifi/iwl-io.c
index 66c873399ab,0f8b8aa9e8d..3dfebfb8434
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@@ -27,10 -27,9 +27,10 @@@
   *****************************************************************************/
  #include <linux/delay.h>
  #include <linux/device.h>
 +#include <linux/export.h>
  
  #include "iwl-io.h"
- #include"iwl-csr.h"
+ #include "iwl-csr.h"
  #include "iwl-debug.h"
  
  #define IWL_POLL_INTERVAL 10	/* microseconds */
diff --cc drivers/video/exynos/exynos_mipi_dsi.c
index 6c1f5c314a4,115e1b0a197..9908e75ae76
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@@ -102,11 -102,9 +102,11 @@@ static void exynos_mipi_update_cfg(stru
  	/* set display timing. */
  	exynos_mipi_dsi_set_display_mode(dsim, dsim->dsim_config);
  
 +	exynos_mipi_dsi_init_interrupt(dsim);
 +
  	/*
  	 * data from Display controller(FIMD) is transferred in video mode
- 	 * but in case of command mode, all settigs is updated to registers.
+ 	 * but in case of command mode, all settings are updated to registers.
  	 */
  	exynos_mipi_dsi_stand_by(dsim, 1);
  }
diff --cc mm/vmscan.c
index 66e431060c0,8deb5f4da4d..347b3ff2a47
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -1567,10 -1659,11 +1567,11 @@@ static int vmscan_swappiness(struct sca
   * by looking at the fraction of the pages scanned we did rotate back
   * onto the active list instead of evict.
   *
-  * nr[0] = anon pages to scan; nr[1] = file pages to scan
+  * nr[0] = anon inactive pages to scan; nr[1] = anon active pages to scan
+  * nr[2] = file inactive pages to scan; nr[3] = file active pages to scan
   */
 -static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
 -			   unsigned long *nr, int priority)
 +static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc,
 +			   unsigned long *nr)
  {
  	unsigned long anon, file, free;
  	unsigned long anon_prio, file_prio;