From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 02:22:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v3.5-rc1~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8650a08232e75274304b812ff04cfce9af9671c;p=thirdparty%2Flinux.git

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

e8650a08232e75274304b812ff04cfce9af9671c
diff --cc arch/blackfin/Kconfig
index 7f3c589cc0243,b83e89ced9882..79cfe2614bcc8
--- a/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"