From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Aug 2013 02:09:40 +0000 (+1000)
Subject: Merge remote-tracking branch 'cgroup/for-next'
X-Git-Tag: next-20130805~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51c981cb8ad9df0a574d33986dc48623d1f52ea1;p=karo-tx-linux.git

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

51c981cb8ad9df0a574d33986dc48623d1f52ea1
diff --cc kernel/cgroup.c
index 789ec4683db3,ae4c46834633..e82423dc76a7
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -802,9 -804,9 +804,8 @@@ static struct cgroup *task_cgroup_from_
   */
  
  static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
 -static struct dentry *cgroup_lookup(struct inode *, struct dentry *, unsigned int);
  static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry);
- static int cgroup_populate_dir(struct cgroup *cgrp, bool base_files,
- 			       unsigned long subsys_mask);
+ static int cgroup_populate_dir(struct cgroup *cgrp, unsigned long subsys_mask);
  static const struct inode_operations cgroup_dir_inode_operations;
  static const struct file_operations proc_cgroupstats_operations;