| commit | 7d34f46426c4f24a6c3356d5a938798a865ec9c6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 30 Nov 2009 21:43:30 +0000 (30 13:43 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 30 Nov 2009 21:43:30 +0000 (30 13:43 -0800) | ||
| tree | fc4f33785a528ed394337240d86ee896731dc39e | treesnapshot (tar.gz zip) |
| parent | 6e80133f7f247f313da1638af4ce30f2bac303cc | commitdiff |
| parent | a0a74d1ee2e38eb936a0437330da3a2fbc12b54e | 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:
sata_fsl: Split hard and soft reset
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_fsl: Split hard and soft reset