diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-27 05:16:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-27 05:16:38 +0200 |
| commit | 533995ed85730a1f5f385b9ecb2d2b4b731d27b4 (patch) | |
| tree | 1dcccfbece1d9275f1c595c460492afdf7551a17 /security/integrity/ima/ima_main.c | |
| parent | leds: after setting inverted attribute, we must update the LED (diff) | |
| parent | m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open (diff) | |
| download | linux-533995ed85730a1f5f385b9ecb2d2b4b731d27b4.tar.xz linux-533995ed85730a1f5f385b9ecb2d2b4b731d27b4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
m68k: Fix redefinition of pgprot_noncached
arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
m68k: cnt reaches -1, not 0
m68k: count can reach 51, not 50
Diffstat (limited to 'security/integrity/ima/ima_main.c')
0 files changed, 0 insertions, 0 deletions