]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Aug 2009 15:59:56 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Aug 2009 15:59:56 +0000 (08:59 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM


Trivial merge