Merge branch 'for-2.6.34-next' into for-2.6.34

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 78ef023227d4bbcabc5e5d72d3126462c9b9ca26..1195a806fe0cd7eec9915e616141c76db564d538 100644 (file)
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -49,8 +49,8 @@ struct io_context {
        /*
         * For request batching
         */
-       unsigned long last_waited; /* Time last woken after wait for request */
        int nr_batch_requests;     /* Number of requests left in the batch */
+       unsigned long last_waited; /* Time last woken after wait for request */
 
        struct radix_tree_root radix_root;
        struct hlist_head cic_list;