summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-10 17:59:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-10 17:59:56 +0200
commit2c661a669b3e2e34311d7965271a628671191e45 (patch)
tree661f8ed4913a3d98c1a620e66a408f2262bf4bb0 /drivers/acpi
parentMN10300: includecheck fix: mn10300, pci.h (diff)
parentpowerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM (diff)
downloadlinux-2c661a669b3e2e34311d7965271a628671191e45.tar.xz
linux-2c661a669b3e2e34311d7965271a628671191e45.zip
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
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions