From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 6 Feb 2008 18:46:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v3.12-rc1~23410
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e33f6635da037ed4d2634ee6bdf5c4d601946c18;p=kernel%2Fkernel-generic.git

Merge git://git./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.
---

e33f6635da037ed4d2634ee6bdf5c4d601946c18