summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-08-3111-82/+121
|\
| * Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linusMark Brown2014-08-311-2/+2
| |\
| | * spi: sh-msiof: Fix transmit-only DMA transfersGeert Uytterhoeven2014-08-311-2/+2
| * | Merge tag 'spi-v3.17-rc3' into spi-linusMark Brown2014-08-3111-82/+121
| |\ \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | | \
| | *-------------. \ Merge remote-tracking branches 'spi/fix/au1550', 'spi/fix/davinci', 'spi/fix/...Mark Brown2014-08-3010-49/+83
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | * | spi: rspi: Fix leaking of unused DMA descriptorsGeert Uytterhoeven2014-08-171-36/+58
| | | | | | | | | * | | spi/rockchip: Avoid accidentally turning off the clockDoug Anderson2014-08-291-1/+1
| | | | | | | | | * | | spi/rockchip: fixup incorrect dma direction settingAddy Ke2014-08-201-1/+1
| | | | | | | | | |/ /
| | | | | | | | * / / spi/pxa2xx: Add ACPI ID for Intel BraswellAlan Cox2014-08-201-0/+1
| | | | | | | | |/ /
| | | | | | | * | | spi/omap-mcspi: Fix the spi task hangs waiting dma_rxJorge A. Ventura2014-08-111-1/+2
| | | | | | * | | | spi: dw: fix kernel crash due to NULL pointer dereferenceAndy Shevchenko2014-08-271-1/+1
| | | | | | * | | | spi: dw-pci: fix bug when regs left uninitializedAndy Shevchenko2014-08-271-0/+2
| | | | | | | |/ / | | | | | | |/| |
| | | | | * | | | spi: Add missing kerneldoc bitsThierry Reding2014-08-132-0/+8
| | | | | | |/ / | | | | | |/| |
| | | | * | | | spi: davinci: fix SPI_NO_CS functionalityGrygorii Strashko2014-08-211-8/+8
| | | | | |/ / | | | | |/| |
| | | * / | | spi: spi-au1550: fix build failureManuel Lauss2014-08-191-1/+1
| | | |/ / /
| | * | | / Merge remote-tracking branch 'spi/fix/sh-msiof' into spi-linusMark Brown2014-08-301-33/+38
| |/| | | | | | | |_|/ | | |/| |
| | * | | spi: sh-msiof: Fix leaking of unused DMA descriptorsGeert Uytterhoeven2014-08-171-33/+38
| | |/ /
* | | | Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-08-311-1/+1
|\ \ \ \
| * | | | locks: pass correct "before" pointer to locks_unlink_lock in generic_add_leaseJeff Layton2014-08-221-1/+1
* | | | | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-08-307-4/+37
|\ \ \ \ \
| * | | | | x86, irq, PCI: Keep IRQ assignment for runtime power managementJiang Liu2014-08-295-2/+20
| * | | | | x86: irq: Fix bug in setting IOAPIC pin attributesJiang Liu2014-08-271-1/+14
| * | | | | x86: Fix non-PC platform kernel crash on boot due to NULL dereferenceAndy Shevchenko2014-08-252-1/+3
* | | | | | Merge tag 'pm+acpi-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-08-305-11/+49
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'pm-cpufreq'Rafael J. Wysocki2014-08-282-2/+3
| |\ \ \ \ \ \
| | * | | | | | cpufreq: s5pv210: Remove spurious __init annotationMark Brown2014-08-281-1/+1
| | * | | | | | cpufreq: intel_pstate: Add CPU ID for Braswell processorMika Westerberg2014-08-281-0/+1
| | * | | | | | intel_pstate: Turn per cpu printk into pr_debugAndi Kleen2014-08-281-1/+1
| | | |_|/ / / | | |/| | | |
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. \ \ \ \ \ Merge branches 'acpi-scan', 'acpi-ec' and 'acpi-lpss'Rafael J. Wysocki2014-08-283-9/+46
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | | | * | | | | ACPI / LPSS: Add ACPI IDs for Intel BraswellAlan Cox2014-08-261-0/+17
| | |_|/ / / / / | |/| | | | | |
| | | * | | | | ACPI / EC: Add support to disallow QR_EC to be issued before completing previ...Lv Zheng2014-08-261-2/+2
| | | * | | | | ACPI / EC: Add support to disallow QR_EC to be issued when SCI_EVT isn't setLv Zheng2014-08-261-1/+16
| | |/ / / / / | |/| | | | |
| | * | | | | ACPI: Run fixed event device notifications in process contextLan Tianyu2014-08-261-5/+10
| | * | | | | ACPI / scan: Allow ACPI drivers to bind to PNP device objectsRafael J. Wysocki2014-08-261-1/+1
| |/ / / / /
* | | | | | Merge branch 'akpm' (fixes from Andrew Morton)Linus Torvalds2014-08-3044-177/+238
|\ \ \ \ \ \
| * | | | | | kexec: purgatory: add clean-up for purgatory directoryMichael Welling2014-08-301-0/+1
| * | | | | | Documentation/kdump/kdump.txt: add ARM descriptionHuKeping2014-08-301-3/+33
| * | | | | | flush_icache_range: export symbol to fix build errorsPranith Kumar2014-08-305-0/+5
| * | | | | | tools: selftests: fix build issue with make kselftests targetPhong Tran2014-08-303-11/+11
| * | | | | | ocfs2: quorum: add a log for node not fencedJunxiao Bi2014-08-301-2/+11
| * | | | | | ocfs2: o2net: set tcp user timeout to max valueJunxiao Bi2014-08-302-0/+21
| * | | | | | ocfs2: o2net: don't shutdown connection when idle timeoutJunxiao Bi2014-08-301-6/+19
| * | | | | | ocfs2: do not write error flag to user structure we cannot copy from/toBen Hutchings2014-08-301-86/+43
| * | | | | | x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatoryVivek Goyal2014-08-301-0/+1
| * | | | | | drivers/rtc/rtc-s5m.c: re-add support for devices without irq specifiedBartlomiej Zolnierkiewicz2014-08-301-7/+14
| * | | | | | xattr: fix check for simultaneous glibc header inclusionFilipe Brandenburger2014-08-301-1/+1
| * | | | | | kexec: remove CONFIG_KEXEC dependency on cryptoVivek Goyal2014-08-308-16/+0
| * | | | | | kexec: create a new config option CONFIG_KEXEC_FILE for new syscallVivek Goyal2014-08-308-20/+42
| * | | | | | x86,mm: fix pte_special versus pte_numaHugh Dickins2014-08-302-6/+10
| * | | | | | hugetlb_cgroup: use lockdep_assert_held rather than spin_is_lockedMichal Hocko2014-08-301-1/+1