cluster: RHEL54 - Merge branch 'RHEL54' of git://git.fedorahosted.org/cluster into rhel54

[David Teigland]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        dc78211c8df17704c76ef968f7850495094f8c03
Parent:        1673920d5adf8019ddbe880b507b398b1c254c6e
565fc69b92c16e00385008e55339e0434e86edd6
Author:        David Teigland <teigland(a)redhat.com&gt;
AuthorDate:    Mon Mar 29 11:09:52 2010 -0500
Committer:     David Teigland <teigland(a)redhat.com&gt;
CommitterDate: Mon Mar 29 11:09:52 2010 -0500

Merge branch 'RHEL54' of git://git.fedorahosted.org/cluster into rhel54


 cman/daemon/ais.c             |   11 ++++++++---
 gfs-kernel/src/gfs/ops_file.c |    3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)