]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49641f1 3c1e389)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jul 2008 18:37:55 +0000 (11:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Jul 2008 18:37:55 +0000 (11:37 -0700)
commit4d727a781f6c9ab8b446d6596ed2dcd6ce80bb47
tree47f4ce9874ea5e47b14d379f57575c67e533030etree | snapshot
parent49641f1acfdfd437ed9b0a70b86bf36626c02afecommit | diff
parent3c1e3896344063273715b332b1c0534deb9b286ccommit | diff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata-acpi: don't call sleeping function from invalid context
  Added Targa Visionary 1000 IDE adapter to pata_sis.c
  libata-acpi: filter out DIPM enable
Linux 2.6 source tree