| commit | 2c661a669b3e2e34311d7965271a628671191e45 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 08:59:56 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 08:59:56 2009 -0700 |
| tree | 661f8ed4913a3d98c1a620e66a408f2262bf4bb0 | |
| parent | 04e35357e2e3ff4e0cabd6468354cf3dbfeb4f27 [diff] | |
| parent | b2f2e8fee3d62f621e795f25b2fc0f51bbdb4af9 [diff] |
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