diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /kernel/auditsc.c | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 8cbddff6c283..2bfc64786765 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | #include <linux/syscalls.h> | 66 | #include <linux/syscalls.h> |
| 67 | #include <linux/inotify.h> | 67 | #include <linux/inotify.h> |
| 68 | #include <linux/capability.h> | 68 | #include <linux/capability.h> |
| 69 | #include <linux/fs_struct.h> | ||
| 69 | 70 | ||
| 70 | #include "audit.h" | 71 | #include "audit.h" |
| 71 | 72 | ||