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)
commit2c661a669b3e2e34311d7965271a628671191e45
tree661f8ed4913a3d98c1a620e66a408f2262bf4bb0
parent04e35357e2e3ff4e0cabd6468354cf3dbfeb4f27
parentb2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* '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