diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 17:55:09 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-03 17:55:09 +0900 |
| commit | 338e33acd820fa89b8a2d5b6574233784702f618 (patch) | |
| tree | e1548e5c8b25d7c703c2aca5e82d71cd62ac5a97 /drivers/regulator/userspace-consumer.c | |
| parent | d683b96b072dc4680fc74964eca77e6a23d1fa6e (diff) | |
| parent | 52a2a1087b5924de00484f35ef5e2a73f61dbd22 (diff) | |
| download | talos-obmc-linux-338e33acd820fa89b8a2d5b6574233784702f618.tar.gz talos-obmc-linux-338e33acd820fa89b8a2d5b6574233784702f618.zip | |
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata changes from Tejun Heo:
"Nothing too interesting. PCI ID additions, some sata_rcar fixes and a
fringe bug fix for DMADIR handling which shouldn't affect any device
remotely modern."
* 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
sata_rcar: fix interrupt handling
ahci: add an observed PCI ID for Marvell 88se9172 SATA controller
sata_rcar: clear STOP bit in bmdma_start() method
libata: make ata_exec_internal_sg honor DMADIR
ata_piix: add PCI IDs for Intel BayTail
libata: update "Maintained by:" tags
Diffstat (limited to 'drivers/regulator/userspace-consumer.c')
0 files changed, 0 insertions, 0 deletions
