| commit | 8bd51cce98aa80ff8b56d34a0e48316c5f887818 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Apr 10 17:22:31 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Apr 10 17:22:31 2007 -0700 |
| tree | 76735fa7f5767fa379f30399a9bd048a3bbf3fc3 | |
| parent | 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 [diff] | |
| parent | a7a832de9e9624bcf069a5369c3c38ba2f44d460 [diff] |
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: add "optical" to sysfs "media" attribute ide: ugly messages trying to open CD drive with no media present ide: correctly prevent IDE timer expiry function to run if request was already handled