Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git] / include / linux / security.h
Simple merge