tree 9fbf124022944cba2fdd6aa468f1bad8adc6b2ab
parent 1b9894f342a39601bb0420b7b8c7e445670c1b51
parent dfdd8cc903288bb2e2ad6731545be3db7304c133
author Linus Torvalds <torvalds@linux-foundation.org> 1253730316 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253730316 -0700

Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/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