From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Jul 2007 22:19:27 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: upstream/snapshot3+hdmi~32397
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e779220ec3d70843cef5e9f410d7a0c287f46718;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Kill bogus set_fs(KERNEL_DS) in do_rt_sigreturn().
  [SPARC64]: Update defconfig.
  [SPARC64]: Kill explicit %gl register reference.
---

e779220ec3d70843cef5e9f410d7a0c287f46718