Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:43 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 May 2006 17:40:43 +0000 (10:40 -0700)
commit1faadface9c5d000bb16e42c89f24859337cf2db
tree081a296ff0387a516937f96ddadccf6976137497
parent9cfe864842c755ea6dd683e2449016c7c4ca9867
parent42f142371e48fbc44956d57b4e506bb6ce673cd7
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Respect gfp_t argument to dma_alloc_coherent().