summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusJames Morris2011-03-1685-712/+1549
|\
| * Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git...James Morris2011-03-092-7/+33
| |\
| | * AppArmor: kill unused macros in lsm.cShan Wei2011-03-081-2/+0
| | * AppArmor: cleanup generated files correctlyMichal Hocko2011-03-081-1/+1
| | * AppArmor: Cleanup make file to remove cruft and make it easier to readJohn Johansen2011-03-051-5/+33
| * | Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris2011-03-0852-323/+594
| |\ \
| | * | SELinux: implement the new sb_remount LSM hookEric Paris2011-03-031-0/+86
| | * | LSM: Pass -o remount options to the LSMEric Paris2011-03-034-0/+28
| | * | SELinux: Compute SID for the newly created socketHarry Ciao2011-03-031-6/+21
| | * | SELinux: Socket retains creator role and MLS attributeHarry Ciao2011-03-033-7/+29
| | * | SELinux: Auto-generate security_is_socket_classHarry Ciao2011-03-032-0/+24
| | * | Revert "selinux: simplify ioctl checking"Eric Paris2011-02-251-8/+42
| | * | selinux: drop unused packet flow permissionsEric Paris2011-02-251-2/+1
| | * | selinux: Fix packet forwarding checks on postroutingSteffen Klassert2011-02-251-18/+5
| | * | selinux: Fix wrong checks for selinux_policycap_netpeerSteffen Klassert2011-02-251-18/+6
| | * | selinux: Fix check for xfrm selinux context algorithmSteffen Klassert2011-02-251-1/+1
| | * | security: remove unused security_sysctl hookLucian Adrian Grijincu2011-02-014-29/+0
| | * | security/selinux: fix /proc/sys/ labelingLucian Adrian Grijincu2011-02-012-103/+18
| | * | SELinux: Use dentry name in new object labelingEric Paris2011-02-016-37/+197
| | * | fs/vfs/security: pass last path component to LSM on inode creationEric Paris2011-02-0139-94/+136
| * | | KEYS: Add an iovec version of KEYCTL_INSTANTIATEDavid Howells2011-03-086-11/+167
| * | | KEYS: Add a new keyctl op to reject a key with a specified error codeDavid Howells2011-03-0811-20/+81
| * | | KEYS: Add a key type op to permit the key description to be vettedDavid Howells2011-03-084-0/+37
| * | | KEYS: Add an RCU payload dereference macroDavid Howells2011-03-084-6/+7
| * | | Merge branch 'master'; commit 'v2.6.38-rc7' into nextJames Morris2011-03-085835-156967/+310502
| |\ \ \ | | |_|/ | |/| |
| * | | TOMOYO: Fix memory leak upon file open.Tetsuo Handa2011-03-031-4/+1
| * | | ima: remove unnecessary call to ima_must_measureMimi Zohar2011-02-233-15/+7
| * | | IMA: remove IMA imbalance checkingMimi Zohar2011-02-102-104/+4
| * | | IMA: maintain i_readcount in the VFS layerMimi Zohar2011-02-105-27/+14
| * | | IMA: define readcount functionsMimi Zohar2011-02-101-0/+20
| * | | IMA: convert i_readcount to atomicMimi Zohar2011-02-103-10/+11
| * | | Smack: correct final mmap check comparisonCasey Schaufler2011-02-091-1/+1
| * | | security:smack: kill unused SMACK_LIST_MAX, MAY_ANY and MAY_ANYWRITEShan Wei2011-02-091-8/+0
| * | | Smack: correct behavior in the mmap hookCasey Schaufler2011-02-091-36/+49
| | |/ | |/|
| * | CacheFiles: Add calls to path-based security hooksDavid Howells2011-01-242-8/+47
| * | security:selinux: kill unused MAX_AVTAB_HASH_MASK and ebitmap_startbitShan Wei2011-01-242-2/+0
| * | Subject: [PATCH] Smack: mmap controls for library containmentCasey Schaufler2011-01-175-178/+524
* | | Linux 2.6.38v2.6.38Linus Torvalds2011-03-141-1/+1
* | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowell...Linus Torvalds2011-03-143-5/+6
|\ \ \
| * | | MN10300: atomic_read() should ensure it emits a loadDavid Howells2011-03-141-1/+1
| * | | MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not existDavid Howells2011-03-141-2/+2
| * | | MN10300: Proper use of macros get_user() in the case of incremented pointersTkhai Kirill2011-03-141-2/+3
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2011-03-1422-305/+331
|\ \ \ \
| * | | | MIPS: Alchemy: Fix reset for MTX-1 and XXS1500Florian Fainelli2011-03-142-4/+4
| * | | | MIPS: MTX-1: Make au1000_eth probe all PHY addressesFlorian Fainelli2011-03-141-0/+9
| * | | | MIPS: Jz4740: Add HAVE_CLKMaurus Cuelenaere2011-03-141-0/+1
| * | | | MIPS: Move idle task creation to work queueMaksim Rayskiy2011-03-141-2/+29
| * | | | MIPS, Perf-events: Use unsigned delta for right shift in event updateDeng-Cheng Zhu2011-03-141-1/+1
| * | | | MIPS, Perf-events: Work with the new callchain interfaceDeng-Cheng Zhu2011-03-141-57/+6
| * | | | MIPS, Perf-events: Fix event check in validate_event()Deng-Cheng Zhu2011-03-141-2/+3