Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:36:31 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:36:31 +0000 (08:36 -0700)
commit278654541017bc93befe3570edeabd5d9e95e4ea
tree80a6809294155a450ce8105f02847414179e07be
parentb8bba261e05bce1712231060f296001ddf8250ab
parentbb31a8faa270beafcc51a65880c5564c6b718bd6
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: add pio flush for via atapi (was: Re: TR: ASUS A8V Deluxe, x86_64)