diff options
| author | Linus Torvalds <[email protected]> | 2011-04-26 18:39:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-04-26 18:39:37 +0000 |
| commit | 4175242c0dc1d92e821d2b45bc8fe06d4650a7b5 (patch) | |
| tree | 47a2e80324ab28e346946db1eff058cd4e958988 /security/selinux/hooks.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | amd64_edac: Erratum #637 workaround (diff) | |
| download | kernel-4175242c0dc1d92e821d2b45bc8fe06d4650a7b5.tar.gz kernel-4175242c0dc1d92e821d2b45bc8fe06d4650a7b5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Erratum #637 workaround
amd64_edac: Factor in CC6 save area
amd64_edac: Remove node interleave warning
EDAC: Remove debugging output in scrub rate handling
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions