tree b2f4e0c39239ad24524139e8cf008fef24fa306f
parent 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c
parent d58aa8c7b1cc0add7b03e26bdb8988d98d2f4cd1
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193352648 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193352648 -0700

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)