tree 1d833bdf0ba5ae99cd29a5eac8ca75b2621a7574
parent 7c22a3d853804d2716ef4f90cdd693a83819ba11
parent 88c381bf09d7b3f2c2e8749150087aff2c434be4
author Linus Torvalds <torvalds@linux-foundation.org> 1221342682 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221342682 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix PCI_DMA_BUS_IS_PHYS for ARM
  [ARM] 5247/1: tosa: SW_EAR_IN support
  [ARM] 5246/1: tosa: add proper clock alias for tc6393xb clock
  [ARM] 5245/1: Fix warning about unused return value in drivers/pcmcia
  [ARM] OMAP: Fix MMC device data
  imx serial: fix rts handling for non imx1 based hardware
  imx serial: set RXD mux bit on i.MX27 and i.MX31
  i.MX serial: fix init failure
  pcm037: add rts/cts support for serial port