Merge branch 'unstable' into io

diff --cc src/kernel/addr.c
index 4297adaa9ab2eab7d159866652620e1d6c133ce3,80abf6ed0cf29129809c4fb5b637d1effa838745..33754cf06222a1a221bc2ffd96ab6f498738ab80
--- 1/src/kernel/addr.c
--- 2/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@@ -3,9 -3,8 +3,9 @@@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
  #include <linux/writeback.h>  /* generic_writepages */
 +#include <linux/pagevec.h>
  
- int ceph_debug_addr = 50;
+ int ceph_debug_addr = -1;
  #define DOUT_VAR ceph_debug_addr
  #define DOUT_PREFIX "addr: "
  #include "super.h"

diff --cc src/kernel/client.c
Simple merge

diff --cc src/kernel/file.c
Simple merge

diff --cc src/kernel/inode.c
Simple merge

diff --cc src/kernel/mds_client.c
Simple merge

diff --cc src/kernel/messenger.c
Simple merge

diff --cc src/kernel/mon_client.c
Simple merge

diff --cc src/kernel/osd_client.c
Simple merge

diff --cc src/kernel/osdmap.c
Simple merge

diff --cc src/kernel/super.c
Simple merge

diff --cc src/kernel/super.h
Simple merge