]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:46:58 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:46:58 +0000 (10:46 -0800)
commita3ab5fb21c0cdefbf6801520d6b8335726de5833
tree443367576b9a2e30eb32c9d1c422206c87e5a1ad
parent1e75ca5288bc1361a0eee66c76788a1c3de82ccf
parentec67535674aee7b51702445434c7282d7001a1a5
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.