]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b3f7b5 b59cc20)
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)
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

1  2 
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/scan.c
Simple merge
Ubuntu combined Linux kernel mirror