]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Jul 2008 17:55:07 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Jul 2008 17:55:07 +0000 (10:55 -0700)
commit29b7760ff2011d87471e14e02667b237c987b1ec
treec8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49
parent3a5ddee39bceabaa38b5fa2873792498e4fcd1e1
parent4a019b4f51b04e898dafa94d8688800bfa09832e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  pcmcia: ide-cs: Remove outdated comment
  pcmcia: fix cisinfo_t removal
  pcmcia: fix return value in cm4000_cs.c
drivers/ide/legacy/ide-cs.c