Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <[email protected]>
Tue, 23 May 2006 17:40:43 +0000 (10:40 -0700)
committerLinus Torvalds <[email protected]>
Tue, 23 May 2006 17:40:43 +0000 (10:40 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Respect gfp_t argument to dma_alloc_coherent().


Trivial merge