Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:50:48 +0000 (15:50 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 25 Oct 2007 22:50:48 +0000 (15:50 -0700)
commiteadd4f5ea1507403655e9f5aeb0ea944eaa9d5de
treeb2f4e0c39239ad24524139e8cf008fef24fa306f
parent06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c
parentd58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1
Merge branch 'master' of git://git./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)