]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (16:35 -0700)
commit97c97515f16f06177a2c071b6578fa28b3407d5a
tree0a808684e7d5e61427ccd0ecb7f3849164a32aef
parent4846f9e8b1190b87059ccbccf482d06f841a0c34
parentf97281c62107970528a9e9507b38d7e5d534302c
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] the latest consensus libata resume fix