From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 May 2008 22:39:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.26-rc3~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=20a249896bb53536b69b228593dbdb6eb0d18113;p=linux-2.6-omap-h63xx.git

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: Update defconfig.
  sparc64: Fix lmb_reserve() args in find_ramdisk().
---

20a249896bb53536b69b228593dbdb6eb0d18113