openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm
History
Dave Airlie e8115e79aa Linux 3.18-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
 		2014-12-02 10:58:33 +10:00
..
boot Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
common dma: edma: move device registration to platform code 2014-11-05 18:26:10 -08:00
configs Samsung defconfig update for v3.18 2014-11-27 14:26:52 +01:00
crypto
…
firmware
…
include ARM: 8226/1: cacheflush: get rid of restarting block 2014-11-27 15:55:35 +00:00
kernel Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 2014-11-28 13:32:47 -08:00
kvm arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn() 2014-11-26 14:40:45 +01:00
lib ARM: 8137/1: fix get_user BE behavior for target variable with size of 8 bytes 2014-09-12 17:38:59 +01:00
mach-at91 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
mach-axxia
…
mach-bcm Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc 2014-09-25 23:50:02 +02:00
mach-berlin
…
mach-clps711x ARM: SoC platform changes for 3.18 2014-10-08 17:13:04 -04:00
mach-cns3xxx CNS3xxx: Fix PCIe read size limit. 2014-09-25 23:35:01 +02:00
mach-davinci ARM: SoC DT updates for 3.18 2014-10-08 17:22:23 -04:00
mach-dove
…
mach-ebsa110 kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-efm32
…
mach-ep93xx kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-exynos Samsung fixes for v3.18 2014-10-14 23:31:13 -07:00
mach-footbridge kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-gemini
…
mach-highbank mailbox: rename pl320-ipc specific mailbox.h 2014-10-08 10:39:33 +05:30
mach-hisi ARM: hisi: depend on ARCH_MULTI_V7 2014-10-02 16:40:10 +02:00
mach-imx ARM: imx: clk-vf610: define PLL's clock tree 2014-11-04 13:40:14 +08:00
mach-integrator PCI changes for the v3.18 merge window: 2014-10-09 15:03:49 -04:00
mach-iop13xx kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-iop32x kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-iop33x kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-ixp4xx ARM: ixp4xx: remove compilation warnings in io.h 2014-10-28 22:04:01 +01:00
mach-keystone
…
mach-ks8695 kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-lpc32xx ARM: LPC32xx: Fix reset function 2014-09-10 17:25:14 +02:00
mach-mediatek
…
mach-meson ARM: meson: add basic support for MesonX SoCs 2014-09-25 17:34:42 +02:00
mach-mmp
…
mach-moxart
…
mach-msm
…
mach-mv78xx0
…
mach-mvebu ARM: mvebu: add missing of_node_put() call in coherency.c 2014-11-07 02:56:36 +00:00
mach-mxs
…
mach-netx
…
mach-nomadik
…
mach-nspire
…
mach-omap1
…
mach-omap2 The i.MX fixes for 3.18, 2nd round: 2014-11-04 20:37:25 -08:00
mach-orion5x ARM: orion5x: Convert pr_warning to pr_warn 2014-09-13 21:29:21 +00:00
mach-picoxcell
…
mach-prima2
…
mach-pxa ARM: pxa: fix hang on startup with DEBUG_LL 2014-10-20 21:11:40 +02:00
mach-qcom
…
mach-realview
…
mach-rockchip ARM: rockchip: enable the AMBA bus 2014-09-02 22:27:26 +02:00
mach-rpc kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-s3c24xx Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
mach-s3c64xx Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
mach-s5pv210 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
mach-sa1100 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
mach-shmobile Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
mach-socfpga arm: socfpga: fix fetching cpu1start_addr for SMP 2014-10-21 14:04:14 -05:00
mach-spear ARM: spear: Remove references to PLAT_SPEAR_SINGLE 2014-09-05 13:33:41 +02:00
mach-sti
…
mach-sunxi ARM: sunxi: Remove sun4i reboot code from mach directory 2014-09-11 21:01:47 +02:00
mach-tegra ARM: tegra: irq: fix buggy usage of irq_data irq field 2014-11-27 14:01:55 +01:00
mach-u300 kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
mach-ux500
…
mach-versatile
…
mach-vexpress
…
mach-vt8500 arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500 2014-09-26 01:49:03 +02:00
mach-w90x900
…
mach-zynq ACPI and power management updates for 3.18-rc1 2014-10-09 16:07:43 -04:00
mm Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 2014-11-28 13:32:47 -08:00
net net: bpf: arm: make hole-faulting more robust 2014-09-23 12:40:22 -04:00
nwfpe
…
oprofile
…
plat-iop kbuild: remove unnecessary variable initializaions 2014-10-02 13:55:02 +02:00
plat-omap Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00
plat-orion ARM: orion: Fix for certain sequence of request_irq can cause irq storm 2014-11-01 22:07:45 +00:00
plat-pxa ARM: pxa: ssp: provide platform_device_id for PXA3xx 2014-09-19 01:56:02 +08:00
plat-samsung Samsung fixes for v3.18 2014-10-14 23:31:13 -07:00
plat-versatile
…
tools
…
vfp
…
xen xen/arm: remove mach_to_phys rbtree 2014-09-11 18:11:53 +00:00
Kconfig xen: features and fixes for 3.18-rc0 2014-10-11 20:29:01 -04:00
Kconfig-nommu
…
Kconfig.debug ARM: pxa: fix hang on startup with DEBUG_LL 2014-10-20 21:11:40 +02:00
Makefile Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2014-10-14 09:22:26 +02:00