git » linux-kernel » commit 7d34f46

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

author Linus Torvalds
2009-11-30 21:43:30 UTC
committer Linus Torvalds
2009-11-30 21:43:30 UTC
parent 6e80133f7f247f313da1638af4ce30f2bac303cc
parent a0a74d1ee2e38eb936a0437330da3a2fbc12b54e
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:
  sata_fsl: Split hard and soft reset