Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches based on more recent version of the tree.
2011-09-15 15:08:05 +02:00
parent 10e4ac572e cc39c6a9bb
commit e060c38434
3980 changed files with 199230 additions and 61613 deletions
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -93,6 +93,7 @@ struct ceph_msg {
 	bool more_to_follow;
 	bool needs_out_seq;
 	int front_max;
+	unsigned long ack_stamp;        /* tx: when we were acked */

 	struct ceph_msgpool *pool;
 };