projects / linux-edison.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59bf9f0 14a86b3)
Merge tag 'v3.10.80' into edison-3.10-2015ww25
authorMatt Mullins <mmullins@mmlx.us>
Sun, 21 Jun 2015 22:52:39 +0000 (15:52 -0700)
committerMatt Mullins <mmullins@mmlx.us>
Sun, 21 Jun 2015 22:58:40 +0000 (15:58 -0700)
commit75da32029896e000bc1492cc3ed06fd0d7284e1b
treea874493bb206b8b2f13dca6f3fd0a3b06c87a982tree
parent59bf9f0ec2e70c61d893297277510c89ea61889ecommit | diff
parent14a86b32c5f7ec8cef6c81d235da200468d340dfcommit | diff
Merge tag 'v3.10.80' into edison-3.10-2015ww25

This is the 3.10.80 stable release

Conflicts:
drivers/bluetooth/hci_ldisc.c
drivers/hwmon/coretemp.c
drivers/mmc/card/block.c
drivers/mmc/card/queue.h
drivers/mmc/host/sdhci.c
drivers/spi/spi-dw-mid.c
include/sound/compress_driver.h
sound/core/compress_offload.c

I didn't even test how well I resolved the conflicts at all.
48 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/Makefile diff1 | diff2 | blob | history
arch/x86/include/asm/fixmap.h diff1 | diff2 | blob | history
arch/x86/include/asm/setup.h diff1 | diff2 | blob | history
arch/x86/include/uapi/asm/msr-index.h diff1 | diff2 | blob | history
arch/x86/kernel/apic/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/intel.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
drivers/acpi/osl.c diff1 | diff2 | blob | history
drivers/cpufreq/Makefile diff1 | diff2 | blob | history
drivers/gpio/gpiolib.c diff1 | diff2 | blob | history
drivers/hwmon/Kconfig diff1 | diff2 | blob | history
drivers/i2c/busses/Kconfig diff1 | diff2 | blob | history
drivers/i2c/busses/i2c-designware-core.c diff1 | diff2 | blob | history
drivers/idle/intel_idle.c diff1 | diff2 | blob | history
drivers/iio/inkern.c diff1 | diff2 | blob | history
drivers/mmc/card/block.c diff1 | diff2 | blob | history
drivers/mmc/host/sdhci.c diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
drivers/spi/spi-dw-mid.c diff1 | diff2 | blob | history
drivers/spi/spi-dw.c diff1 | diff2 | blob | history
drivers/tty/serial/serial_core.c diff1 | diff2 | blob | history
drivers/usb/core/hcd.c diff1 | diff2 | blob | history
drivers/usb/dwc3/core.c diff1 | diff2 | blob | history
drivers/usb/dwc3/core.h diff1 | diff2 | blob | history
drivers/usb/dwc3/ep0.c diff1 | diff2 | blob | history
drivers/usb/dwc3/gadget.c diff1 | diff2 | blob | history
drivers/usb/dwc3/gadget.h diff1 | diff2 | blob | history
drivers/usb/gadget/udc-core.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-pci.c diff1 | diff2 | blob | history
drivers/usb/host/xhci.c diff1 | diff2 | blob | history
fs/ecryptfs/crypto.c diff1 | diff2 | blob | history
include/linux/irq.h diff1 | diff2 | blob | history
include/linux/irqdesc.h diff1 | diff2 | blob | history
include/linux/usb/hcd.h diff1 | diff2 | blob | history
include/sound/compress_driver.h diff1 | diff2 | blob | history
include/sound/core.h diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/power/process.c diff1 | diff2 | blob | history
kernel/printk.c diff1 | diff2 | blob | history
net/bluetooth/l2cap_sock.c diff1 | diff2 | blob | history
sound/core/compress_offload.c diff1 | diff2 | blob | history
sound/soc/codecs/wm8994.c diff1 | diff2 | blob | history
sound/soc/soc-dapm.c diff1 | diff2 | blob | history
sound/soc/soc-pcm.c diff1 | diff2 | blob | history
Intel Edison kernel - building x86_64 support