]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9631eb0 a7a832d)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:22:31 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:22:31 +0000 (17:22 -0700)
commit8bd51cce98aa80ff8b56d34a0e48316c5f887818
tree76735fa7f5767fa379f30399a9bd048a3bbf3fc3tree | snapshot
parent9631eb0bc18bc1fd1cc84e535260d67ed6a36865commit | diff
parenta7a832de9e9624bcf069a5369c3c38ba2f44d460commit | 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
Unnamed repository; edit this file 'description' to name the repository.