From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 25 Oct 2007 22:50:48 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.24-rc2~138
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eadd4f5ea1507403655e9f5aeb0ea944eaa9d5de;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: pass correct addr in get_fb_unmapped_area(MAP_FIXED)
---

eadd4f5ea1507403655e9f5aeb0ea944eaa9d5de