merge by hand (qla_os.c mismerge)

Documentation/DocBook/Makefile

Documentation/DocBook/scsidrivers.tmpl

Documentation/SubmittingPatches

Documentation/networking/vortex.txt

Documentation/scsi/ChangeLog.megaraid

Documentation/scsi/scsi-changer.txt

Documentation/scsi/scsi_mid_low_api.txt

MAINTAINERS

Makefile

arch/arm/Kconfig

arch/arm/mach-integrator/integrator_cp.c

arch/arm/mach-pxa/lubbock.c

arch/arm/mach-pxa/mainstone.c

arch/arm/mach-pxa/pxa25x.c

arch/arm/mach-pxa/pxa27x.c

arch/arm/mach-versatile/core.c

arch/i386/kernel/apm.c

arch/m68k/configs/amiga_defconfig

arch/m68k/configs/apollo_defconfig

arch/m68k/configs/atari_defconfig