From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2015 16:50:27 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v4.1-rc1~149
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d0bbe0dd353af9521e9d8bc5236308c677b6f62a

Merge branch 'for-linus' of git://git./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
---

d0bbe0dd353af9521e9d8bc5236308c677b6f62a
diff --cc arch/powerpc/perf/hv-24x7.c
index 9445a824819e,23cb66ced793..abeb9ec0d117
--- a/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/si2168_priv.h
index aadd1367673f,451d85456639..d7efce8043ed
--- a/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];