| commit | cbeb2864b162f4298111196c8ce8ce492577cdee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 07 11:40:15 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 07 11:40:15 2009 -0700 |
| tree | 0ddc68c3c1231a38955d7fca71a28cfc43eb0996 | |
| parent | f69fb9c39868463f6b0b8306824341bd5610250b [diff] | |
| parent | c9a2bfd1f08973115c2fc3da9372e0e81ac42a19 [diff] |
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