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

This commit is contained in:
Linus Torvalds 2006-02-27 20:43:36 -08:00
commit a8b76b4915
3 changed files with 7 additions and 0 deletions