diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:22:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:22:31 -0700 |
| commit | 8bd51cce98aa80ff8b56d34a0e48316c5f887818 (patch) | |
| tree | 76735fa7f5767fa379f30399a9bd048a3bbf3fc3 /include/asm-m68k | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | ide: add "optical" to sysfs "media" attribute (diff) | |
| download | linux-dev-8bd51cce98aa80ff8b56d34a0e48316c5f887818.tar.xz linux-dev-8bd51cce98aa80ff8b56d34a0e48316c5f887818.zip | |
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
Diffstat (limited to 'include/asm-m68k')
0 files changed, 0 insertions, 0 deletions