Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:30:31 +0000 (20:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 26 May 2013 03:30:31 +0000 (20:30 -0700)
commit27a24cfa04c6f041c0191847d047f25e5627cd63
treec5377af546f914cc9ca665fd00c825204d61ef35
parent6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5
parentb59cc200ac025aca597fb21862c1c9e667f2eff2
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
drivers/acpi/scan.c