diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-11 12:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-11 12:42:55 -0700 |
| commit | 7b5ca22643beba8fdd5b7055e0594a514b3710d7 (patch) | |
| tree | 5a2326eccbd4d3c4f22046a9a165ca4947575f48 /fs/proc/kmsg.c | |
| parent | 2b79bc4f7ebbd5af3c8b867968f9f15602d5f802 (diff) | |
| parent | 124a6eece386226191ec79e279a5471bd2614f81 (diff) | |
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:
ata_piix: The Sony TZ90 needs the cable type hardcoding
ata_piix: ICH7 does not support correct MWDMA timings
Avoid world-writable sysfs files in libata driver.
libata: fix suspend/resume for ATA SEMB devices
libata: clear ering on resume
pata_pdc202xx_old: fix UDMA33 handling
sata_mv: use new sata phy register settings for new devices
libata: fix attach error handling
Diffstat (limited to 'fs/proc/kmsg.c')
0 files changed, 0 insertions, 0 deletions