Merge tag 'gpio-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git] / kernel / audit.c
diff --cc kernel/audit.c
Simple merge