Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 12 May 2007 16:47:47 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 12 May 2007 16:47:47 +0000 (09:47 -0700)
commit33d444f182a1757640077c6b7381e54c13142b1d
tree106bf7bdd645c2efd645ff3973fcfd64d41cfce8
parentae7d5c8622a518601a21f14de5c70de5f1c967bf
parent8354c5b72636e5321e9b16dae1da1445506f6af6
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
  [SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
  [SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
  [SPARC64]: envctrl.c needs asm/io.h
  [SPARC64]: Update defconfig.
  [TTY]: Export proc_clear_tty() to modulea.
  [SPARC64]: pci_resource_adjust() cannot be __init.
  [SPARC64]: Spelling fixes.
  [SPARC]: Spelling fixes.
  [SPARC64]: Kill LARGE_ALLOCS and update defconfig.