From: Eric Paris <eparis@redhat.com>
Date: Thu, 26 May 2011 21:20:14 +0000 (-0400)
Subject: Merge commit 'v2.6.39' into 20110526
X-Git-Tag: v3.0-rc4~32^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea77f7a2e8561012cf100c530170f12351c3b53e;p=pandora-kernel.git

Merge commit 'v2.6.39' into 20110526

Conflicts:
	lib/flex_array.c
	security/selinux/avc.c
	security/selinux/hooks.c
	security/selinux/ss/policydb.c
	security/smack/smack_lsm.c
---

ea77f7a2e8561012cf100c530170f12351c3b53e
Reading git-diff-tree failed