]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 5 Jul 2006 20:03:18 +0000 (13:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 5 Jul 2006 20:03:18 +0000 (13:03 -0700)
* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3711/1: AT91 timer update
  [ARM] 3709/1: pnx4008: convert to generic irq subsystem
  [ARM] 3710/1: AT91 Serial: Use GPIO API


Trivial merge