summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-05-0120-201/+450
|\
| * Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-nextJames Morris2013-04-206-87/+207
| |\
| | * TPM: Retry SaveState command in suspend pathDuncan Laurie2013-04-172-4/+30
| | * tpm/tpm_i2c_infineon: Add small comment about return value of __i2c_transferPeter Huewe2013-04-121-0/+9
| | * tpm/tpm_i2c_infineon.c: Add OF attributes type and name to the of_device_id t...Peter Huewe2013-04-121-3/+18
| | * tpm_i2c_stm_st33: Remove duplicate inclusion of header filesSachin Kamat2013-04-121-2/+0
| | * tpm: Add support for new Infineon I2C TPM (SLB 9645 TT 1.2 I2C)Peter Huewe2013-04-122-40/+99
| | * char/tpm: Convert struct i2c_msg initialization to C99 formatShubhrajyoti Datta2013-04-121-3/+16
| | * drivers/char/tpm/tpm_ppi: use strlcpy instead of strncpyChen Gang2013-04-121-7/+7
| | * tpm/tpm_i2c_stm_st33: formatting and white space changesPeter Huewe2013-04-121-31/+31
| * | ima: eliminate passing d_name.name to process_measurement()Mimi Zohar2013-04-181-9/+5
| |/
| * Smack: include magic.h in smackfs.cCasey Schaufler2013-04-031-0/+1
| * selinux: make security_sb_clone_mnt_opts return an error on context mismatchJeff Layton2013-04-025-13/+46
| * Merge branch 'stage-for-3.10' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-04-016-89/+187
| |\
| | * Fix NULL pointer dereference in smack_inode_unlink() and smack_inode_rmdir()Igor Zhbanov2013-03-191-2/+2
| | * Smack: add support for modification of existing rulesRafal Krypa2013-03-192-79/+181
| | * smack: SMACK_MAGIC to include/uapi/linux/magic.hJarkko Sakkinen2013-03-192-5/+1
| | * Smack: add missing support for transmute bit in smack_str_from_perm()Rafal Krypa2013-03-191-0/+2
| | * Smack: prevent revoke-subject from failing when unseen label is written to itRafal Krypa2013-03-191-3/+1
| | * tomoyo: use DEFINE_SRCU() to define tomoyo_ssLai Jiangshan2013-03-181-3/+2
| * | seccomp: allow BPF_XOR based ALU instructions.Nicolas Schichan2013-03-261-0/+2
| * | tomoyo: use DEFINE_SRCU() to define tomoyo_ssLai Jiangshan2013-03-181-3/+2
| |/
| * Merge tag 'v3.9-rc2' into nextJames Morris2013-03-1111745-289601/+561925
| |\
* | \ Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2013-05-0110-85/+140
|\ \ \
| * | | sata_highbank: Rename proc_name to the module nameRobert Richter2013-05-011-1/+1
| * | | ACPI/libata: Restore libata.noacpi supportLv Zheng2013-05-011-2/+2
| * | | [libata] acpi: make ata_ap_acpi_handle not blockAaron Lu2013-05-011-18/+27
| * | | [libata] SCSI: really use SATL version in VPDBaruch Even2013-04-121-1/+0
| * | | pata_imx: add devicetree supportSascha Hauer2013-04-122-0/+26
| * | | pata_imx: use void __iomem * for regsSascha Hauer2013-04-121-1/+1
| * | | pata_imx: cleanup error pathSascha Hauer2013-04-121-6/+14
| * | | pata_imx: Use devm_clk_getSascha Hauer2013-04-121-3/+2
| * | | sata_rcar: Convert to devm_ioremap_resource()Sachin Kamat2013-04-121-3/+4
| * | | fsl/sata: create a sysfs entry for rx water markQiang Liu2013-04-041-0/+55
| * | | libata-acpi: remove redundent code for power resource handlingAaron Lu2013-04-042-35/+4
| * | | sata_highbank: make ahci_highbank_pm_ops staticJingoo Han2013-04-041-1/+1
| * | | pata_octeon_cf: Use resource_size functionAlexandru Gheorghiu2013-04-041-1/+1
| * | | pata_legacy: bogus clock in opti82c46x_set_piomode()Dan Carpenter2013-04-041-1/+1
| * | | pata_at32: use module_platform_driver_probe()Jingoo Han2013-04-041-12/+1
* | | | Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-05-01253-4145/+6938
|\ \ \ \
| * \ \ \ Merge branch 'pm-cpufreq'Rafael J. Wysocki2013-04-291-214/+69
| |\ \ \ \
| | * | | | cpufreq: Revert incorrect commit 5800043Rafael J. Wysocki2013-04-291-214/+69
| * | | | | Merge branch 'pm-cpufreq'Rafael J. Wysocki2013-04-28122-1240/+2770
| |\| | | |
| | * | | | cpufreq: MAINTAINERS: Add co-maintainerviresh kumar2013-04-261-0/+2
| | * | | | cpufreq: pxa2xx: initialize variablesArnd Bergmann2013-04-251-2/+3
| | * | | | ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=yChen Gang2013-04-241-0/+1
| | * | | | cpufreq: cpu0: Put cpu parent node after using itViresh Kumar2013-04-221-0/+1
| | * | | | cpufreq: ARM big LITTLE: Adapt to latest cpufreq updatesViresh Kumar2013-04-221-7/+3
| | * | | | cpufreq: ARM big LITTLE: put DT nodes after using themViresh Kumar2013-04-221-14/+29
| | * | | | cpufreq: Don't call __cpufreq_governor() for drivers without target()Viresh Kumar2013-04-221-5/+13