diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:55:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:55:07 -0400 |
| commit | f39548a6ad1dbdfaab552419386ec5bb1d76fa0d (patch) | |
| tree | c8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49 /fs/ocfs2/cluster/heartbeat.c | |
| parent | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (diff) | |
| parent | 417e1494fd70715b737428cc3c3d924255f22ba1 (diff) | |
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/ocfs2/cluster/heartbeat.c')
0 files changed, 0 insertions, 0 deletions