]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b04be7 417e149)
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)
* 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

1  2 
drivers/ide/legacy/ide-cs.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ide/legacy/ide-cs.c
Simple merge
Linux 2.6 source tree