From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Mar 2013 02:38:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'cgroup/for-next'
X-Git-Tag: next-20130321~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b81dfb674242629ccd784aa7e31e78e274b2112;p=karo-tx-linux.git

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

Conflicts:
	include/linux/res_counter.h
---

2b81dfb674242629ccd784aa7e31e78e274b2112
diff --cc include/linux/res_counter.h
index c23099413ad6,a83a849bf1d3..f9822dc9d350
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@@ -13,8 -13,7 +13,8 @@@
   * info about what this counter is.
   */
  
- #include <linux/cgroup.h>
 +#include <linux/errno.h>
+ #include <linux/spinlock.h>
  
  /*
   * The core object. the cgroup that wishes to account for some