]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:15 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:15 +0000 (11:40 -0700)
commit8f4d20b44e2a07d6b954a7d59e96e4532bf8374f
tree0ddc68c3c1231a38955d7fca71a28cfc43eb0996
parent59f2e66f74093c2e7d5baff89f24f7eae7e586e4
parent96e4b4fd284efb646c36e65ba304cd7206dfae66
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  pcmcia: add CNF-CDROM-ID for ide