Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Jun 2007 00:02:29 +0000 (17:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Jun 2007 00:02:29 +0000 (17:02 -0700)
commitc52ecdab06ff3b4d0f8914951eb74dc8b049f51c
tree291a55adb3be3fec45dcc6affa72d9d1244ba42a
parentdc315011312f04433e0fdd34b6a3dde4bfde1e48
parentc0f85a82484c25d23b44a87a35daddb2b276b4aa
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: fix pxa27x keyboard driver
  [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
  [ARM] 4421/1: AT91: Value of _KEY fields.
  [ARM] Solve buggy smp_processor_id() usage
  [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
  [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending
  [ARM] 4418/1: AT91: Number of programmable clocks differs
  [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S