summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-devLinus Torvalds2012-01-185-79/+109
|\
| * [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks listBenjamin Larsson2012-01-181-0/+7
| * [libata] add DVRTD08A and DVR-215 to NOSETXFER device quirk listVladimir LAVALLADE2012-01-181-0/+2
| * [libata] pata_bf54x: Support sg list in bmdma transfer.Sonic Zhang2012-01-181-79/+88
| * [libata] sata_fsl: fix the controller operating modeJerry Huang2012-01-181-0/+11
| * [libata] enable ata port async suspendLin Ming2012-01-181-0/+1
* | x86-32: Fix build failure with AUDIT=y, AUDITSYSCALL=nAl Viro2012-01-181-0/+2
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2012-01-1814-36/+50
|\
| * integrity: digital signature config option name changeDmitry Kasatkin2012-01-183-4/+4
| * lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE promptsDmitry Kasatkin2012-01-181-3/+3
| * lib: MPILIB Kconfig description updateDmitry Kasatkin2012-01-181-5/+3
| * lib: digital signature dependency fixDmitry Kasatkin2012-01-181-1/+2
| * lib: digital signature config option name changeDmitry Kasatkin2012-01-184-5/+5
| * encrypted-keys: fix rcu and sparse messagesMimi Zohar2012-01-182-2/+2
| * keys: fix trusted/encrypted keys sparse rcu_assign_pointer messagesMimi Zohar2012-01-184-4/+9
| * KEYS: Add missing smp_rmb() primitives to the keyring search codeDavid Howells2012-01-182-8/+18
| * TOMOYO: Accept \000 as a valid character.Tetsuo Handa2012-01-181-3/+3
| * security: update MAINTAINERS file with new git repoJames Morris2012-01-181-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-1843-500/+810
|\ \
| * | audit: no leading space in audit_log_d_path prefixKees Cook2012-01-173-6/+6
| * | audit: treat s_id as an untrusted stringKees Cook2012-01-172-13/+18
| * | audit: fix signedness bug in audit_log_execve_info()Xi Wang2012-01-171-2/+2
| * | audit: comparison on interprocess fieldsPeter Moody2012-01-172-1/+62
| * | audit: implement all object interfield comparisonsPeter Moody2012-01-172-1/+38
| * | audit: allow interfield comparison between gid and ogidEric Paris2012-01-172-1/+8
| * | audit: complex interfield comparison helperEric Paris2012-01-171-11/+39
| * | audit: allow interfield comparison in audit rulesEric Paris2012-01-173-2/+37
| * | Kernel: Audit Support For The ARM PlatformNathaniel Husted2012-01-176-9/+25
| * | audit: do not call audit_getname on errorEric Paris2012-01-172-18/+13
| * | audit: only allow tasks to set their loginuid if it is -1Eric Paris2012-01-173-4/+24
| * | audit: remove task argument to audit_set_loginuidEric Paris2012-01-173-5/+5
| * | audit: allow audit matching on inode gidEric Paris2012-01-173-0/+14
| * | audit: allow matching on obj_uidEric Paris2012-01-173-0/+14
| * | audit: remove audit_finish_fork as it can't be calledEric Paris2012-01-173-24/+0
| * | audit: reject entry,always rulesEric Paris2012-01-171-2/+4
| * | audit: inline audit_free to simplify the look of generic codeEric Paris2012-01-173-4/+8
| * | audit: drop audit_set_macxattr as it doesn't do anythingEric Paris2012-01-171-2/+0
| * | audit: inline checks for not needing to collect aux recordsEric Paris2012-01-172-15/+23
| * | audit: drop some potentially inadvisable likely notationsEric Paris2012-01-171-6/+6
| * | audit: remove AUDIT_SETUP_CONTEXT as it isn't usedEric Paris2012-01-171-5/+1
| * | audit: inline audit_syscall_entry to reduce burden on archsEric Paris2012-01-1716-86/+72
| * | audit: ia32entry.S sign extend error codes when calling 64 bit codeEric Paris2012-01-171-1/+3
| * | Audit: push audit success and retcode into arch ptrace.hEric Paris2012-01-1726-74/+132
| * | seccomp: audit abnormal end to a process due to seccompEric Paris2012-01-173-21/+39
| * | audit: check current inode and containing object when filtering on major and ...Eric Paris2012-01-171-10/+14
| * | audit: drop the meaningless and format breaking word 'user'Eric Paris2012-01-171-1/+1
| * | audit: dynamically allocate audit_names when not enough space is in the names...Eric Paris2012-01-171-188/+215
| * | audit: make filetype matching consistent with other filtersEric Paris2012-01-172-12/+11
* | | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds2012-01-1818-542/+374
|\ \ \
| * | | xfs: cleanup xfs_file_aio_writeChristoph Hellwig2012-01-171-45/+37