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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)

1 files changed, 11 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c00e3cc22352..1e7d90442651 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3182,6 +3182,16 @@ M:	William Irwin <wli@holomorphy.com>
 S:      Maintained
 F:      fs/hugetlbfs/
 
+Hyper-V CORE AND DRIVERS
+M:      K. Y. Srinivasan <kys@microsoft.com>
+M:      Haiyang Zhang <haiyangz@microsoft.com>
+L:      devel@linuxdriverproject.org
+S:      Maintained
+F:      drivers/hv/
+F:      drivers/hid/hid-hyperv.c
+F:      drivers/net/hyperv/
+F:      drivers/staging/hv/
+
 I2C/SMBUS STUB DRIVER
 M:      "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:      linux-i2c@vger.kernel.org
@@ -3577,8 +3587,7 @@ F:	net/netfilter/ipvs/
 IPWIRELESS DRIVER
 M:      Jiri Kosina <jkosina@suse.cz>
 M:      David Sterba <dsterba@suse.cz>
-S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
+S:      Odd Fixes
 F:      drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
@@ -6321,12 +6330,6 @@ M:	David Täht <d@teklibre.com>
 S:      Odd Fixes
 F:      drivers/staging/frontier/
 
-STAGING - HYPER-V (MICROSOFT)
-M:      Hank Janssen <hjanssen@microsoft.com>
-M:      Haiyang Zhang <haiyangz@microsoft.com>
-S:      Odd Fixes
-F:      drivers/staging/hv/
-
 STAGING - INDUSTRIAL IO
 M:      Jonathan Cameron <jic23@cam.ac.uk>
 L:      linux-iio@vger.kernel.org