| commit | 87618e0003dbca0f51f1ef52fa4199bd65212f41 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 11 23:55:01 2011 -0200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 11 23:55:01 2011 -0200 |
| tree | d814cfe3675352bea6133518b7d93d7052048ece | |
| parent | c1f4246716392ec8693c23cffb969bd73c1b0910 [diff] | |
| parent | 2d5fcc986da944bca8257f358b155eec79fc4120 [diff] |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev * 'upstream-linus' of git://github.com/jgarzik/libata-dev: pata_of_platform: Don't use NO_IRQ [libata] ahci: Add ASMedia ASM1061 support [libata] Issue SRST to Sil3726 PMP sata_sis.c: trivial spelling fix ahci_platform: use dev_get_platdata() [libata] libata-scsi.c: Add function parameter documentation