git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 12 May 2007 16:47:47 +0000 (09:47 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 12 May 2007 16:47:47 +0000 (09:47 -0700)

* 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.

Trivial merge