From: James Morris <james.l.morris@oracle.com>
Date: Fri, 4 May 2012 02:46:40 +0000 (+1000)
Subject: Merge tag 'v3.4-rc5' into next
X-Git-Tag: v3.5-rc1~161^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3;p=pandora-kernel.git

Merge tag 'v3.4-rc5' into next

Linux 3.4-rc5

Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a

Requested by Casey.
---

898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3
Reading git-diff-tree failed