Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 May 2008 22:39:28 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 May 2008 22:39:28 +0000 (15:39 -0700)
commit20a249896bb53536b69b228593dbdb6eb0d18113
tree10311d4995b8e0d7f46d84fd5fd1c4f5edad4a99
parent9a6ab769bdacc65e7d4e931034e12e02c357c4d3
parent109d1c88e9dd7e78ade8da742152e4e4da0d8103
Merge git://git./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().