| commit | c5b9004baac077fb472cc7ac8293f2a9fc918d22 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 9 Apr 2008 15:06:27 +0000 (9 08:06 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 9 Apr 2008 15:06:27 +0000 (9 08:06 -0700) | ||
| tree | 9f9d53daca94392165425c348e83d4795806fac9 | treesnapshot (tar.gz zip) |
| parent | 098107a01a2d427d0be9c19ae5bc9a410efed0c9 | commitdiff |
| parent | ac2c5bd05c88185ecbe7c114e472716f2e2d3a0c | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata/sata_fsl: Remove unused variable in sata_fsl_probe
pata_sil680: Fix build on arch/ppc
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata/sata_fsl: Remove unused variable in sata_fsl_probe
pata_sil680: Fix build on arch/ppc