Merge ../bleed-2.6

Documentation/DocBook/libata.tmpl

Documentation/block/biodoc.txt

Documentation/networking/bonding.txt

Makefile

arch/alpha/kernel/pci-noop.c

arch/alpha/kernel/pci_iommu.c

arch/arm/Kconfig

arch/arm/boot/compressed/head.S

arch/arm/configs/mp1000_defconfig

arch/arm/kernel/module.c

arch/arm/kernel/traps.c

arch/arm/lib/Makefile

arch/arm/lib/sha1.S

arch/arm/mach-aaec2000/Makefile

arch/arm/mach-aaec2000/aaed2000.c

arch/arm/mach-aaec2000/clock.c

arch/arm/mach-aaec2000/clock.h

arch/arm/mach-aaec2000/core.c

arch/arm/mach-aaec2000/core.h

arch/arm/mach-clps711x/Kconfig