| commit | dc79d2f21a2dc19df26f0cb0b46be2d6241b627b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 03 18:15:18 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 03 18:15:18 2009 -0800 |
| tree | ba6191124786698b8da63938c20638bf97c31464 | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a [diff] | |
| parent | f38e35b43f2924b3b4e51147b7193f32e9276db4 [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: sata_via: Remove redundant device ID for VIA VT8261 drivers/ata/libata: Move dereference after NULL test ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2