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

Pull trivial tree from Jiri Kosina:
 "Usual trivial tree updates.  Nothing outstanding -- mostly printk()
  and comment fixes and unused identifier removals"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  goldfish: goldfish_tty_probe() is not using 'i' any more
  powerpc: Fix comment in smu.h
  qla2xxx: Fix printks in ql_log message
  lib: correct link to the original source for div64_u64
  si2168, tda10071, m88ds3103: Fix firmware wording
  usb: storage: Fix printk in isd200_log_config()
  qla2xxx: Fix printk in qla25xx_setup_mode
  init/main: fix reset_device comment
  ipwireless: missing assignment
  goldfish: remove unreachable line of code
  coredump: Fix do_coredump() comment
  stacktrace.h: remove duplicate declaration task_struct
  smpboot.h: Remove unused function prototype
  treewide: Fix typo in printk messages
  treewide: Fix typo in printk messages
  mod_devicetable: fix comment for match_flags

diff --cc arch/powerpc/kernel/prom.c
Simple merge

diff --cc arch/powerpc/perf/hv-24x7.c
index 9445a824819ea7f919fdc4191b561e07c07bd49c,23cb66ced7931fc2676e81e2df99aa4c2de1b4a3..abeb9ec0d117890bc284d70ac6283513a15be648
--- 1/arch/powerpc/perf/hv-24x7.c
--- 2/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@@ -1123,10 -359,10 +1123,10 @@@ static int h_24x7_event_init(struct per
                return -EIO;
        }
  
 -      /* PHYSICAL domains & other lpars require extra capabilities */
 +      /* Physical domains & other lpars require extra capabilities */
        if (!caps.collect_privileged && (is_physical_domain(domain) ||
                (event_get_lpar(event) != event_get_lpar_max()))) {
-               pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n",
+               pr_devel("hv permissions disallow: is_physical_domain:%d, lpar=0x%llx\n",
                                is_physical_domain(domain),
                                event_get_lpar(event));
                return -EACCES;

diff --cc drivers/media/dvb-frontends/m88ds3103.c
Simple merge

diff --cc drivers/media/dvb-frontends/si2168_priv.h
index aadd1367673fed96140a8abd9955bb4d6c6dad55,451d8545663917d537e6bfa254b8112b43935b7c..d7efce8043edb421f32d1b5e11f62f4fc5db44e6
--- 1/drivers/media/dvb-frontends/si2168_priv.h
--- 2/drivers/media/dvb-frontends/si2168_priv.h
+++ b/drivers/media/dvb-frontends/si2168_priv.h
@@@ -37,10 -38,9 +37,10 @@@ struct si2168_dev 
        bool active;
        bool fw_loaded;
        u8 ts_mode;
 +      bool ts_clock_inv;
  };
  
- /* firmare command struct */
+ /* firmware command struct */
  #define SI2168_ARGLEN      30
  struct si2168_cmd {
        u8 args[SI2168_ARGLEN];

diff --cc drivers/mmc/core/mmc.c
Simple merge

diff --cc drivers/mmc/core/sd.c
Simple merge

diff --cc drivers/mtd/nand/gpmi-nand/gpmi-lib.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/wcn36xx/smd.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8723be/dm.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
Simple merge

diff --cc drivers/pinctrl/nomadik/pinctrl-abx500.c
Simple merge

diff --cc drivers/scsi/ch.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/tty/goldfish.c
Simple merge

diff --cc drivers/tty/ipwireless/hardware.c
Simple merge

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

diff --cc init/main.c
Simple merge

diff --cc net/sunrpc/xprtrdma/verbs.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc tools/perf/util/probe-finder.c
Simple merge