tree f32da67f80d89f43177f340de919aed72808bab8
parent 4e4bc305e16440ab38060d61fbcb7d774881d2f1
parent 7281c248f797723f66244b7ecef204620f664648
author Linus Torvalds <torvalds@g5.osdl.org> 1161121591 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161121591 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] switch to new pci_get_bus_and_slot API
  [ARM] Update mach-types
  [ARM] Fix Zaurii keyboard/touchscreen drivers
  [ARM] Fix fallout from IRQ regs changes
  [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h
  [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c
  [ARM] 3888/1: add pxa27x SSP FSRT register bit definition