diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:04:12 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-19 01:04:12 +0100 |
commit | ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a (patch) | |
tree | 2223e34469b7d70a2c740b55379fd09ff95257b6 /Documentation/kprobes.txt | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
parent | cy82c693: fix PCI device selection (diff) | |
download | linux-ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a.tar.xz linux-ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
cy82c693: fix PCI device selection
icside: DMA support fix
IDE: Don't powerdown Compaq Triflex IDE device on suspend
piix: ICH7 MWDMA1 errata
Diffstat (limited to 'Documentation/kprobes.txt')
0 files changed, 0 insertions, 0 deletions