diff options
author | Linus Torvalds | 2012-01-18 01:43:39 +0100 |
---|---|---|
committer | Linus Torvalds | 2012-01-18 01:43:39 +0100 |
commit | a25a2b84098eb5e001cb8086603d692aa95bf2ec (patch) | |
tree | 02c01b36251f7b0afb1a98093e14efb17d015910 /drivers/watchdog/nuc900_wdt.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
parent | integrity: digital signature config option name change (diff) | |
download | kernel-qcow2-linux-a25a2b84098eb5e001cb8086603d692aa95bf2ec.tar.gz kernel-qcow2-linux-a25a2b84098eb5e001cb8086603d692aa95bf2ec.tar.xz kernel-qcow2-linux-a25a2b84098eb5e001cb8086603d692aa95bf2ec.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
integrity: digital signature config option name change
lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
lib: MPILIB Kconfig description update
lib: digital signature dependency fix
lib: digital signature config option name change
encrypted-keys: fix rcu and sparse messages
keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
KEYS: Add missing smp_rmb() primitives to the keyring search code
TOMOYO: Accept \000 as a valid character.
security: update MAINTAINERS file with new git repo
Diffstat (limited to 'drivers/watchdog/nuc900_wdt.c')
0 files changed, 0 insertions, 0 deletions