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

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_fsl: Split hard and soft reset

...

This commit is contained in:

Linus Torvalds 2009-11-30 13:43:30 -08:00

parent 6e80133f7f a0a74d1ee2

commit 7d34f46426

1 changed files with 44 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

84

drivers/ata/sata_fsl.c

View file