Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...
[pandora-kernel.git] / kernel / audit.c
diff --cc kernel/audit.c
Simple merge