Linux 3.4-rc5 Merge to pull in prerequisite change for Smack: 86812bb0de Requested by Casey.
86812bb0de