Commit 402a917a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5405/1: ep93xx: remove unused gesbc9312.h header
  [ARM] 5404/1: Fix condition in arm_elf_read_implies_exec() to set READ_IMPLIES_EXEC
  [ARM] omap: fix clock reparenting in omap2_clk_set_parent()
  [ARM] 5403/1: pxa25x_ep_fifo_flush() *ep->reg_udccs always set to 0
  [ARM] 5402/1: fix a case of wrap-around in sanity_check_meminfo()
  [ARM] 5401/1: Orion: fix edge triggered GPIO interrupt support
  [ARM] 5400/1: Add support for inverted rdy_busy pin for Atmel nand device controller
  [ARM] 5391/1: AT91: Enable GPIO clocks earlier
  [ARM] 5390/1: AT91: Watchdog fixes
  [ARM] 5398/1: Add Wan ZongShun to MAINTAINERS for W90P910
  [ARM] omap: fix _omap2_clksel_get_src_field()
  [ARM] omap: fix omap2_divisor_to_clksel() error return value
parents bcf8951f 9dd446f6

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -692,6 +692,13 @@ M: kernel@wantstofly.org 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained



ARM/NUVOTON W90X900 ARM ARCHITECTURE

P:      Wan ZongShun

M:      mcuos.com@gmail.com

L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

W:      http://www.mcuos.com

S:      Maintained



ARPD SUPPORT

P:	Jonathan Layes

L:	netdev@vger.kernel.org

arch/arm/configs/at91sam9260ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91SAM9_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y



#

# USB-based Watchdog Cards

arch/arm/configs/at91sam9261ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91SAM9_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y



#

# USB-based Watchdog Cards

arch/arm/configs/at91sam9263ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91SAM9_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y



#

# USB-based Watchdog Cards

arch/arm/configs/at91sam9rlek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_AT91SAM9_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y



#

# Sonics Silicon Backplane

CRA Git | Maintained and supported by SUSTech CRA and CCSE