]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit97bb690df2ac9e2d51b5acc35798af8bd45e95e4
tree106bf7bdd645c2efd645ff3973fcfd64d41cfce8
parent3d9b56683f2ccdace7392ca434ce3f61e83fe18a
parent221de883978a10624ea6db65fae53211fe166b13
Merge master.kernel.org:/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.