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

Conflicts:
	include/linux/res_counter.h

diff --cc include/linux/res_counter.h
index c23099413ad6c03b935826d6680388cc3976ce81,a83a849bf1d360f713b1449a6c993815c4800048..f9822dc9d35006806f21960c4714cfad76048409
--- 1/include/linux/res_counter.h
--- 2/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