]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12d810c 471e44b)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:07:59 +0000 (09:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:07:59 +0000 (09:07 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] Add drive to NCQ blacklist


Trivial merge
Linux 2.6 source tree