summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: cttimeout: fix dependency with l4protocol conntrack modulePablo Neira Ayuso2012-03-235-25/+53
* netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6Pablo Neira Ayuso2012-03-221-6/+6
* sky2: override for PCI legacy power managementstephen hemminger2012-03-211-0/+11
* net: fix napi_reuse_skb() skb reserveEric Dumazet2012-03-211-1/+2
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-03-2171-250/+1034
|\
| * Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/...James Morris2012-03-201-2/+2
| |\
| | * AppArmor: Fix location of const qualifier on generated string tablesTetsuo Handa2012-03-201-2/+2
| * | TOMOYO: Return error if fails to delete a domainTetsuo Handa2012-03-201-4/+5
| |/
| * Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/...James Morris2012-03-1513-52/+189
| |\
| | * AppArmor: add const qualifiers to string arraysJan Engelhardt2012-03-154-7/+7
| | * AppArmor: Add ability to load extended policyJohn Johansen2012-03-154-1/+50
| | * AppArmor: Move path failure information into aa_get_name and renameJohn Johansen2012-03-144-19/+29
| | * AppArmor: Update dfa matching routines.John Johansen2012-03-143-4/+81
| | * AppArmor: Minor cleanup of d_namespace_path to consolidate error handlingJohn Johansen2012-03-141-10/+6
| | * AppArmor: Retrieve the dentry_path for error reporting when path lookup failsJohn Johansen2012-03-141-6/+9
| | * AppArmor: Add const qualifiers to generated string tablesJohn Johansen2012-03-141-2/+3
| | * AppArmor: Fix oops in policy unpack auditingJohn Johansen2012-03-141-2/+3
| | * AppArmor: Fix error returned when a path lookup is disconnectedJohn Johansen2012-03-141-1/+1
| * | TOMOYO: Return appropriate value to poll().Tetsuo Handa2012-03-154-43/+26
| |/
| * KEYS: testing wrong bit for KEY_FLAG_REVOKEDDan Carpenter2012-03-071-1/+2
| * TOMOYO: Fix mount flags checking order.Tetsuo Handa2012-03-011-18/+20
| * security: fix ima kconfig warningRandy Dunlap2012-02-281-1/+1
| * AppArmor: Fix the error case for chroot relative path name lookupJohn Johansen2012-02-271-3/+2
| * AppArmor: fix mapping of META_READ to audit and quiet flagsJohn Johansen2012-02-271-2/+1
| * AppArmor: Fix underflow in xindex calculationJohn Johansen2012-02-271-1/+1
| * AppArmor: Fix dropping of allowed operations that are force auditedJohn Johansen2012-02-272-3/+3
| * AppArmor: Add mising end of structure test to caps unpackingJohn Johansen2012-02-271-0/+2
| * AppArmor: export known rlimit names/value mappings in securityfsKees Cook2012-02-274-6/+29
| * AppArmor: add "file" details to securityfsKees Cook2012-02-272-0/+16
| * AppArmor: add initial "features" directory to securityfsKees Cook2012-02-272-0/+65
| * AppArmor: refactor securityfs to use structuresKees Cook2012-02-272-42/+114
| * IMA: fix audit res field to indicate 1 for success and 0 for failureEric Paris2012-02-162-2/+2
| * Yama: add PR_SET_PTRACER_ANYKees Cook2012-02-163-3/+13
| * TPM: Zero buffer whole after copying to userspaceTim Gardner2012-02-141-1/+2
| * tpm_tis: Clean up after module_param cleanupStefan Berger2012-02-141-4/+5
| * tpm_tis: Only probe iTPMsStefan Berger2012-02-142-3/+7
| * security: trim security.hAl Viro2012-02-1419-26/+66
| * mm: collapse security_vm_enough_memory() variants into a single functionAl Viro2012-02-148-38/+10
| * digsig: changed type of the timestampDmitry Kasatkin2012-02-101-2/+2
| * security: Yama LSMKees Cook2012-02-098-0/+411
| * security: create task_free security callbackKees Cook2012-02-094-0/+20
| * Merge branch 'next-queue' into nextJames Morris2012-02-0910-3/+28
| |\
| | * ima: policy for RAMFSDmitry Kasatkin2012-01-201-0/+1
| | * ima: fix Kconfig dependenciesFabio Estevam2012-01-202-2/+1
| | * KEYS: Allow special keyrings to be clearedDavid Howells2012-01-197-1/+26
| * | Merge branch 'linus-master'; commit 'v3.3-rc3' into nextJames Morris2012-02-090-0/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-03-2138-654/+5831
|\ \ \
| * | | padata: Fix race on sequence number wrapSteffen Klassert2012-03-142-32/+12
| * | | padata: Fix race in the serialization pathSteffen Klassert2012-03-141-2/+4
| * | | crypto: camellia - add assembler implementation for x86_64Jussi Kivilinna2012-03-144-0/+2492