From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Aug 2009 15:59:56 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.31-rc6~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c661a669b3e2e34311d7965271a628671191e45;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'merge' of git://git.kernel.org/pub/scm/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
---

2c661a669b3e2e34311d7965271a628671191e45