Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
commite33f6635da037ed4d2634ee6bdf5c4d601946c18
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:46:58 +0000 (6 10:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:46:58 +0000 (6 10:46 -0800)
tree443367576b9a2e30eb32c9d1c422206c87e5a1ad
parent55850f47333c6e7d932e6426eaed863b27c9cd7f
parent38192d52f159bc06b7f523800c10b583cdd661d5
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Temporarily remove IOMMU merging code.
  [SPARC64]: Update defconfig.
  [SPARC]: Add new timerfd syscall entries.