diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 18:23:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 18:23:17 (GMT) |
| commit | 6adc74b7d03c06a8e15d51fe33c3d924ada9271a (patch) | |
| tree | 84b934ed223e0c4aa4f6233b38eea0f8e50f00ef /fs/timerfd.c | |
| parent | c9059598ea8981d02356eead3188bf7fa4d717b8 (diff) | |
| parent | 517d3cc15b36392e518abab6bacbb72089658313 (diff) | |
| download | linux-fsl-qoriq-6adc74b7d03c06a8e15d51fe33c3d924ada9271a.tar.xz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] ata_piix: Enable parallel scan
sata_nv: use hardreset only for post-boot probing
[libata] ahci: Restore SB600 SATA controller 64 bit DMA
ata_piix: Remove stale comment
ata_piix: Turn on hotplugging support for older chips
ahci: misc cleanups for EM stuff
[libata] get rid of ATA_MAX_QUEUE loop in ata_qc_complete_multiple() v2
sata_sil: enable 32-bit PIO
sata_sx4: speed up ECC initialization
libata-sff: avoid byte swapping in ata_sff_data_xfer()
[libata] ahci: use less error-prone array initializers
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions