Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commitd9ec5ad24ce80b7ef69a0717363db661d13aada5
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (28 16:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (28 16:35 -0700)
tree0a808684e7d5e61427ccd0ecb7f3849164a32aef
parentb82e8005af14b51600714971e0c6420c4e334a50
parent0737ac895afbfbe210557fa5fbafcca932d5fa7c
Merge branch 'upstream-fixes' of /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