]> nv-tegra.nvidia Code Review - linux-2.6.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)
commitf39548a6ad1dbdfaab552419386ec5bb1d76fa0d
treec8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49
parent2b04be7e8ab5756ea36e137dd03c8773d184e67e
parent417e1494fd70715b737428cc3c3d924255f22ba1
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