tree 443367576b9a2e30eb32c9d1c422206c87e5a1ad
parent 55850f47333c6e7d932e6426eaed863b27c9cd7f
parent 38192d52f159bc06b7f523800c10b583cdd661d5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202323618 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202323618 -0800

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