| commit | c135b6592bd63925397e60425e0301f33f06c7a6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 08:52:05 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 08:52:05 2008 -0700 |
| tree | ad935da857c1a680b2a821e8889993ca5a59a8ff | |
| parent | 5f78e4d33945b291d12765cdd7e4304f437b9361 [diff] | |
| parent | 65c0d4e54ae4b81d8c8bb685169e48306656bb5c [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: Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2) sata_mv: Improve naming of main_irq cause/mask identifiers libata-scsi: improve rbuf handling for simulated commands libata-scsi: clean up inquiry / mode sense related functions [MIPS] ATA: Rename routerboard 500 to 532