tree bb7e9bf87204a60fea86389d5f79fc4fa79b7ec7
parent 60d4684068ff1eec78f55b5888d0bd2d4cca1520
parent 260e98edc8ae8ea862c9c222eeffb1a2eeafa7fc
author Linus Torvalds <torvalds@g5.osdl.org> 1156821556 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1156821556 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3761/1: fix armv4t breakage after adding thumb interworking to userspace helpers
  [ARM] Add Integrator support for glibc outb() and friends
  [ARM] Move prototype for register_isa_ports to asm/io.h
  [ARM] Arrange for isa.c to use named initialisers
  [ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems
  [ARM] 3760/1: This patch adds timeouts while working with SSP registers. Such timeouts were en
  [ARM] 3758/1: Preserve signalling NaNs in conversion
  [ARM] 3749/3: Correct VFP single/double conversion emulation
  [ARM] 3748/3: Correct error check in vfp_raise_exceptions