diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 01:38:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 01:38:54 +0400 |
| commit | add2b10f2ba15ac231181306c975e58d26f9bd54 (patch) | |
| tree | e3196992ab39adfa42a4fe4234f9f6b2ce0ba5b1 /security/apparmor/path.c | |
| parent | 3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a (diff) | |
| parent | 3e073367a57d41e506f20aebb98e308387ce3090 (diff) | |
| download | linux-add2b10f2ba15ac231181306c975e58d26f9bd54.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix printk format errors
alpha: convert perf_event to use local_t
Fix call to replaced SuperIO functions
alpha: remove homegrown L1_CACHE_ALIGN macro
Diffstat (limited to 'security/apparmor/path.c')
0 files changed, 0 insertions, 0 deletions