]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 063394f 3f4f81f)
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)
commita87e55949efa948286ec280c835ec3e48cd52caf
tree76735fa7f5767fa379f30399a9bd048a3bbf3fc3tree | snapshot
parent063394fa7949ad129d4782988e08a1b5d5d3786fcommit | diff
parent3f4f81f4c1c8450f73bd7b3b6269ce1080ef22cbcommit | 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
Linux Kernel Source Tree.