Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Fri, 8 Aug 2008 18:38:42 +0000 (11:38 -0700)]
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information

1  2 
MAINTAINERS

diff --combined MAINTAINERS
@@@ -594,6 -594,11 +594,11 @@@ M:       kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
+ ARM/MAGICIAN MACHINE SUPPORT
+ P:    Philipp Zabel
+ M:    philipp.zabel@gmail.com
+ S:    Maintained
  ARM/TOSA MACHINE SUPPORT
  P:    Dmitry Baryshkov
  M:    dbaryshkov@gmail.com
@@@ -720,15 -725,6 +725,15 @@@ L:       linux-wireless@vger.kernel.or
  L:    ath5k-devel@lists.ath5k.org
  S:    Maintained
  
 +ATHEROS ATH9K WIRELESS DRIVER
 +P:    Luis R. Rodriguez
 +M:    lrodriguez@atheros.com
 +P:    Jouni Malinen
 +M:    jmalinen@atheros.com
 +L:    linux-wireless@vger.kernel.org
 +L:    ath9k-devel@lists.ath9k.org
 +S:    Supported
 +
  ATI_REMOTE2 DRIVER
  P:    Ville Syrjala
  M:    syrjala@sci.fi