shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-05 12:43:09 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
5d77d9c5e177d2182df5d9fd61ba986facb64415
linux/arch/arm
History
Dave Airlie e8115e79aa 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
Merge tag 'v3.18-rc7' into drm-next
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
Merge tag 'samsung-defconfig-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2014-11-27 14:26:52 +01:00
crypto
ARM: 8125/1: crypto: enable NEON SHA-1 for big endian
2014-08-27 15:44:11 +01:00
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
ARM: Add platform support for LSI AXM55xx SoC
2014-05-23 18:18:39 +02:00
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
Merge tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
2014-07-07 22:42:24 -07:00
mach-clps711x
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
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
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
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
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
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
Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
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
ARM: keystone requires ARM_PATCH_PHYS_VIRT
2014-06-17 17:09:22 +02:00
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
arm: add basic support for Mediatek MT6589 boards
2014-07-22 17:52:37 +02:00
mach-meson
ARM: meson: add basic support for MesonX SoCs
2014-09-25 17:34:42 +02:00
mach-mmp
ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define
2014-07-04 21:19:08 +08:00
mach-moxart
ARM: use menuconfig for sub-arch menus
2014-06-17 17:09:48 +02:00
mach-msm
ARM: msm: Update the references to DEBUG_MSM_UARTx
2014-08-24 20:09:36 +02:00
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
ARM: use menuconfig for sub-arch menus
2014-06-17 17:09:48 +02:00
mach-nspire
…
mach-omap1
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:00:26 -07:00
mach-omap2
Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
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
ARM: use menuconfig for sub-arch menus
2014-06-17 17:09:48 +02:00
mach-pxa
ARM: pxa: fix hang on startup with DEBUG_LL
2014-10-20 21:11:40 +02:00
mach-qcom
ARM: qcom: Add initial IPQ8064 SoC and AP148 device trees
2014-08-21 11:43:34 -05:00
mach-realview
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:00:26 -07:00
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
Merge tag 'v3.18-rc7' into drm-next
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
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
2014-07-12 13:59:24 +01:00
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
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
2014-07-12 13:59:24 +01:00
mach-versatile
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
mach-vexpress
vexpress/spc: fix a build warning on array bounds
2014-08-31 10:22:10 -07:00
mach-vt8500
arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
2014-09-26 01:49:03 +02:00
mach-w90x900
arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
2014-08-08 15:57:28 -07:00
mach-zynq
Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
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
ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+
2014-07-18 12:29:04 +01:00
oprofile
Merge branch 'devel-stable' into for-next
2014-08-05 10:27:25 +01:00
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
Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
2014-10-14 23:31:13 -07:00
plat-versatile
video: move Versatile CLCD helpers
2014-06-27 10:15:22 +02:00
tools
…
vfp
ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+
2014-07-18 12:29:04 +01:00
xen
xen/arm: remove mach_to_phys rbtree
2014-09-11 18:11:53 +00:00
Kconfig
Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
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