From: Linus Torvalds Date: Fri, 8 Aug 2008 18:38:42 +0000 (-0700) Subject: Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.27-rc3~67 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b75b87ce2dfbd99e59a50c3681b154d07e3a22;p=linux-2.6 Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm * '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 instead of 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 --- 49b75b87ce2dfbd99e59a50c3681b154d07e3a22