Merge remote-tracking branch 'block/for-next'

Conflicts:
	drivers/block/drbd/drbd_proc.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/aoe/aoecmd.c
Simple merge

diff --cc drivers/block/drbd/drbd_proc.c
index 928adb815b09f6b83fc6420faaeeaf8bd64f8404,30fe0a57f5a01967bfb0aa1358afe68e5bfcdca6..bf31d41dbaadf023a57057bb03006c77146c7879
--- 1/drivers/block/drbd/drbd_proc.c
--- 2/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@@ -313,8 -313,14 +313,14 @@@ static int drbd_seq_show(struct seq_fil
  
  static int drbd_proc_open(struct inode *inode, struct file *file)
  {
-       if (try_module_get(THIS_MODULE))
-               return single_open(file, drbd_seq_show, PDE_DATA(inode));
+       int err;
+ 
+       if (try_module_get(THIS_MODULE)) {
 -              err = single_open(file, drbd_seq_show, PDE(inode)->data);
++              err = single_open(file, drbd_seq_show, PDE_DATA(inode));
+               if (err)
+                       module_put(THIS_MODULE);
+               return err;
+       }
        return -ENODEV;
  }
  

diff --cc drivers/block/pktcdvd.c
Simple merge

diff --cc drivers/message/fusion/mptsas.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge