Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

author	Huang, Tao <huangtao@rock-chips.com>
	Fri, 5 Dec 2014 13:18:34 +0000 (21:18 +0800)
committer	Huang, Tao <huangtao@rock-chips.com>
	Fri, 5 Dec 2014 13:18:34 +0000 (21:18 +0800)
commit	d03390bfcdb71807a537254455a2938322926d57
tree	7586811f4829c1dc0eddfeda51eae2c4e820fc0a	tree \| snapshot
parent	e46863d23c4753b4f523dcdde0a907c06df40494	commit \| diff
parent	38dce4af8de2655716b67600a552eded6407ea2f	commit \| diff

Merge tag 'lsk-v3.10-android-14.11'

LSK Android 14.11 v3.10

Conflicts:
arch/arm/include/asm/cputype.h

20 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event_cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rtsx_pci_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/perf_event_cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rtsx_pci_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history