From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 06:38:08 +0000 (+1100)
Subject: Merge remote-tracking branch 'selinux/master'
X-Git-Tag: next-20140106~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95ac5794f951b25c68ecd765462c2ca781d2386c;p=karo-tx-linux.git

Merge remote-tracking branch 'selinux/master'

Conflicts:
	security/selinux/hooks.c
---

95ac5794f951b25c68ecd765462c2ca781d2386c