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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-davinci/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/omap-mpuss-lowpower.c
Simple merge

diff --cc arch/arm/mach-omap2/sr_device.c
Simple merge

diff --cc arch/arm/mach-omap2/twl-common.c
Simple merge

diff --cc arch/x86/kernel/module.c
Simple merge

diff --cc drivers/hwmon/emc2103.c
Simple merge

diff --cc drivers/net/phy/smsc.c
Simple merge

diff --cc drivers/net/usb/smsc75xx.c
Simple merge

diff --cc drivers/net/usb/smsc95xx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-io.c
index 66c8733,0f8b8aa..3dfebfb
--- 1/drivers/net/wireless/iwlwifi/iwl-io.c
--- 2/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/power/Kconfig
Simple merge

diff --cc drivers/video/bfin_adv7393fb.c
Simple merge

diff --cc drivers/video/exynos/exynos_dp_reg.c
Simple merge

diff --cc drivers/video/exynos/exynos_mipi_dsi.c
index 6c1f5c3,115e1b0..9908e75
--- 1/drivers/video/exynos/exynos_mipi_dsi.c
--- 2/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 drivers/video/s3c-fb.c
Simple merge

diff --cc drivers/video/savage/savagefb_driver.c
Simple merge

diff --cc drivers/video/smscufx.c
Simple merge

diff --cc fs/btrfs/extent_io.c
Simple merge

diff --cc include/linux/mmzone.h
Simple merge

diff --cc mm/vmscan.c
index 66e4310,8deb5f4..347b3ff
--- 1/mm/vmscan.c
--- 2/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;

diff --cc net/core/netprio_cgroup.c
Simple merge