]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 16 Jun 2007 00:34:34 +0000 (17:34 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 16 Jun 2007 00:34:34 +0000 (17:34 -0700)
commite966a932051ca6bd32b1b0bbe612b84c3d2ebc35
treedb7ae7a5a536d2cd6b686b69759092eb237e252f
parent05e95a3d3fa19ccbba2d7ca9d04bdbac0f405fa2
parentdb157789b1c95e40047f088ffae5453846c766ea
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-scsi: fix OOPS in idescsi_expiry()
  Resume from RAM on HPC nx6325 broken