| commit | d395991c117d43bfca97101a931a41d062a93852 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 29 16:54:33 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 29 16:54:33 2008 -0800 |
| tree | 9c8300a5c24a41c4a3a22f2668158f7fc0899987 | |
| parent | b73384f06159d8388d7d17913b7e3a07e234c1ab [diff] | |
| parent | b445c56815d84b9fce40707f99811bdc354458e0 [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: [libata] wrap kmap_atomic(KM_IRQ0) with local_irq_save/restore() sata_svw: Add support for HT1100 SATA controller