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

Pull trivial updates from Jiri Kosina:
 "As usual, it's mostly typo fixes, redundant code elimination and some
  documentation updates."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
  edac, mips: don't change code that has been removed in edac/mips tree
  xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
  lib: Change mail address of Oskar Schirmer
  net: Change mail address of Oskar Schirmer
  arm/m68k: Change mail address of Sebastian Hess
  i2c: Change mail address of Oskar Schirmer
  net: Fix tcp_build_and_update_options comment in struct tcp_sock
  atomic64_32.h: fix parameter naming mismatch
  Kconfig: replace "--- help ---" with "---help---"
  c2port: fix bogus Kconfig "default no"
  edac: Fix spelling errors.
  qla1280: Remove redundant NULL check before release_firmware() call
  remoteproc: remove redundant NULL check before release_firmware()
  qla2xxx: Remove redundant NULL check before release_firmware() call.
  aic94xx: Get rid of redundant NULL check before release_firmware() call
  tehuti: delete redundant NULL check before release_firmware()
  qlogic: get rid of a redundant test for NULL before call to release_firmware()
  bna: remove redundant NULL test before release_firmware()
  tg3: remove redundant NULL test before release_firmware() call
  typhoon: get rid of redundant conditional before all to release_firmware()
  ...

diff --cc Documentation/ABI/testing/sysfs-bus-usb
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/blackfin/Kconfig
index 7f3c589cc0243db4641fd735d4e18f290206e96f,b83e89ced9882e2237cd8abd13c12caafe0f2d5e..79cfe2614bcc871f7faff8fd8c0d6f2c02b54fe8
--- 1/arch/blackfin/Kconfig
--- 2/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@@ -1309,121 -1258,9 +1309,121 @@@ config PM_BFIN_WAKE_G
          (all processors, except ADSP-BF549). This option sets
          the general-purpose wake-up enable (GPWE) control bit to enable
          wake-up upon detection of an active low signal on the /GPW (PH7) pin.
-         On ADSP-BF549 this option enables the the same functionality on the
+         On ADSP-BF549 this option enables the same functionality on the
          /MRXON pin also PH7.
  
 +config PM_BFIN_WAKE_PA15
 +      bool "Allow Wake-Up from PA15"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PA15 Wake-Up
 +
 +config PM_BFIN_WAKE_PA15_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PA15
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PB15
 +      bool "Allow Wake-Up from PB15"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PB15 Wake-Up
 +
 +config PM_BFIN_WAKE_PB15_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PB15
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PC15
 +      bool "Allow Wake-Up from PC15"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PC15 Wake-Up
 +
 +config PM_BFIN_WAKE_PC15_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PC15
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PD06
 +      bool "Allow Wake-Up from PD06(ETH0_PHYINT)"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PD06(ETH0_PHYINT) Wake-up
 +
 +config PM_BFIN_WAKE_PD06_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PD06
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PE12
 +      bool "Allow Wake-Up from PE12(ETH1_PHYINT, PUSH BUTTON)"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PE12(ETH1_PHYINT, PUSH BUTTON) Wake-up
 +
 +config PM_BFIN_WAKE_PE12_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PE12
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PG04
 +      bool "Allow Wake-Up from PG04(CAN0_RX)"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PG04(CAN0_RX) Wake-up
 +
 +config PM_BFIN_WAKE_PG04_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PG04
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_PG13
 +      bool "Allow Wake-Up from PG13"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable PG13 Wake-Up
 +
 +config PM_BFIN_WAKE_PG13_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_PG13
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
 +config PM_BFIN_WAKE_USB
 +      bool "Allow Wake-Up from (USB)"
 +      depends on PM && BF60x
 +      default n
 +      help
 +        Enable (USB) Wake-up
 +
 +config PM_BFIN_WAKE_USB_POL
 +      int "Wake-up priority"
 +      depends on PM_BFIN_WAKE_USB
 +      default 0
 +      help
 +        Wake-Up priority 0(low) 1(high)
 +
  endmenu
  
  menu "CPU Frequency scaling"

diff --cc arch/m68k/platform/coldfire/m532x.c
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/pseries/Kconfig
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

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

diff --cc drivers/net/ethernet/brocade/bna/bnad.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/s6gmac.c
Simple merge

diff --cc drivers/net/ethernet/tehuti/tehuti.c
Simple merge

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/ptp/Kconfig
Simple merge

diff --cc drivers/regulator/tps65910-regulator.c
Simple merge

diff --cc drivers/remoteproc/remoteproc_core.c
Simple merge

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

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

diff --cc drivers/usb/gadget/u_serial.c
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/storage/unusual_devs.h
Simple merge

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

diff --cc drivers/xen/Kconfig
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

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

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc net/atm/lec.h
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge