diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
| commit | 27a24cfa04c6f041c0191847d047f25e5627cd63 (patch) | |
| tree | c5377af546f914cc9ca665fd00c825204d61ef35 /include/acpi/acpi_bus.h | |
| parent | 6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5 (diff) | |
| parent | b59cc200ac025aca597fb21862c1c9e667f2eff2 (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fixes from Vinod Koul:
"We have two patches from Andy & Rafael fixing the Lynxpoint dma"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
ACPI / LPSS: register clock device for Lynxpoint DMA properly
dma: acpi-dma: parse CSRT to extract additional resources
Diffstat (limited to 'include/acpi/acpi_bus.h')
0 files changed, 0 insertions, 0 deletions