From: Andrew Morton <akpm@linux-foundation.org>

Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Daniel Hokka Zakrisson <daniel@hozac.com>
Cc: James Morris <jmorris@namei.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 security/device_cgroup.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff -puN security/device_cgroup.c~cgroups-implement-device-whitelist-v6-cleanups security/device_cgroup.c
--- a/security/device_cgroup.c~cgroups-implement-device-whitelist-v6-cleanups
+++ a/security/device_cgroup.c
@@ -48,14 +48,12 @@ struct dev_cgroup {
 	spinlock_t lock;
 };
 
-static inline struct dev_cgroup *cgroup_to_devcgroup(
-		struct cgroup *cgroup)
+static inline struct dev_cgroup *cgroup_to_devcgroup(struct cgroup *cgroup)
 {
 	return container_of(cgroup_subsys_state(cgroup, devices_subsys_id),
 			    struct dev_cgroup, css);
 }
 
-
 struct cgroup_subsys devices_subsys;
 
 static int devcgroup_can_attach(struct cgroup_subsys *ss,
_