summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 19:55:07 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 19:55:07 +0200
commitf39548a6ad1dbdfaab552419386ec5bb1d76fa0d (patch)
treec8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49 /fs
parentMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentpcmcia: ide-cs: Remove outdated comment (diff)
downloadlinux-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.tar.xz
linux-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.zip
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions