]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8bba26 bb31a8f)
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)
* '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)


Trivial merge
Linux 2.6 source tree