From: James Morris <jmorris@namei.org>
Date: Thu, 6 May 2010 00:56:07 +0000 (+1000)
Subject: Merge branch 'master' into next
X-Git-Tag: drm-fsl-dcu-for-next~17025^2^2~14
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=0ffbe2699cda6afbe08501098dff8a8c2fe6ae09

Merge branch 'master' into next
---

0ffbe2699cda6afbe08501098dff8a8c2fe6ae09
diff --cc security/selinux/netlink.c
index 7d7be296d876,0e147b6914ad..36ac257cec9a
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@@ -11,8 -11,10 +11,9 @@@
   */
  #include <linux/init.h>
  #include <linux/types.h>
+ #include <linux/slab.h>
  #include <linux/stddef.h>
  #include <linux/kernel.h>
 -#include <linux/list.h>
  #include <linux/skbuff.h>
  #include <linux/netlink.h>
  #include <linux/selinux_netlink.h>