diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 22:59:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 22:59:32 +0200 |
| commit | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 (patch) | |
| tree | a63db9ea2871bcd05f3cb95fc152be33ea929a1a /security/apparmor/procattr.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | HWPOISON: Stop shrinking at right page count (diff) | |
| download | linux-6b0cd00bc396daf5c2dcf17a8d82055335341f46.tar.xz linux-6b0cd00bc396daf5c2dcf17a8d82055335341f46.zip | |
Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
HWPOISON: Stop shrinking at right page count
HWPOISON: Report correct address granuality for AO huge page errors
HWPOISON: Copy si_addr_lsb to user
page-types.c: fix name of unpoison interface
Diffstat (limited to 'security/apparmor/procattr.c')
0 files changed, 0 insertions, 0 deletions