summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-1612-48/+102
|\
| *---. Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-nextRoland Dreier2011-03-1510-20/+52
| |\ \ \
| | | | * IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADsMitko Haralanov2011-03-141-2/+3
| | | | * IB/qib: Set default LE2 value for active cables to 0Mitko Haralanov2011-03-142-3/+12
| | | | * IB/qib: Return correct MAD when setting link width to 255Mitko Haralanov2011-02-231-3/+4
| | | * | IB/ipath: Don't reset disabled devicesNicolas Kaiser2011-03-141-0/+1
| | | |/
| | * | RDMA/cxgb4: Debugfs dump_qp() updatesSteve Wise2011-03-141-4/+9
| | * | RDMA/cxgb4: Dispatch FATAL event on EEH errorsSteve Wise2011-03-141-1/+9
| | * | RDMA/cxgb4: Use ULP_MODE_TCPDDPSteve Wise2011-03-142-0/+3
| | * | RDMA/cxgb4: Enable on-chip SQ support by defaultSteve Wise2011-03-141-2/+2
| | * | RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reapsSteve Wise2011-03-141-1/+7
| | * | RDMA/cxgb4: Remove db_drop_taskSteve Wise2011-03-142-2/+0
| | * | RDMA/cxgb4: Turn on delayed ACKSteve Wise2011-03-141-2/+2
| | |/
| * | RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific oneSean Hefty2011-03-151-27/+16
| * | IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH stateSean Hefty2011-03-151-1/+18
| * | IB/cm: Bump reference count on cm_id before invoking callbackSean Hefty2011-03-151-0/+1
| * | RDMA/cma: Fix crash in request handlersSean Hefty2011-03-151-0/+15
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-03-1685-712/+1549
|\ \
| * \ Merge branch 'next' into for-linusJames Morris2011-03-1585-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-091-2/+0
| | | * | AppArmor: cleanup generated files correctlyMichal Hocko2011-03-091-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-085774-121529/+275064
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 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-101-1/+1