Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 18:25:16 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 18:25:16 +0000 (11:25 -0700)
commita724eada8c2a7b62463b73ccf73fd0bb6e928aeb
tree9fbf124022944cba2fdd6aa468f1bad8adc6b2ab
parent1b9894f342a39601bb0420b7b8c7e445670c1b51
parentdfdd8cc903288bb2e2ad6731545be3db7304c133
Merge branch 'ixp4xx' of git://git./linux/kernel/git/chris/linux-2.6

* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
  Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support.
  ixp4xx: arch_idle() documentation fixup
  ixp4xx: timer and clocks cleanups
MAINTAINERS