Merge tag 'v3.4-rc5' into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 4 May 2012 02:46:40 +0000 (12:46 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 4 May 2012 02:46:40 +0000 (12:46 +1000)
Linux 3.4-rc5

Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a

Requested by Casey.


Trivial merge