From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 14 Jun 2007 22:09:26 +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~33393
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0127d6d5d925321650e7b92364420325689a03ef;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]: Fix args to sun4v_ldc_revoke().
  [SPARC64]: Really fix parport.
  [SPARC64]: Fix IO/MEM space sizing for PCI.
  [SPARC64]: Wire up cookie based sun4v interrupt registry.
---

0127d6d5d925321650e7b92364420325689a03ef