leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cea37f87519ca3172a4e8ddd3ffcd2b4232b341f
linux/arch/arm
History
David Vrabel 2c5cb27703 Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15 
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c
2014-04-07 13:52:12 +01:00
..
boot
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:22:57 -07:00
common
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
configs
ARM: tegra: add LED options back into tegra_defconfig
2014-02-28 21:35:58 +01:00
crypto
CRYPTO: Fix more AES build errors
2014-01-05 13:59:56 +00:00
firmware
ARM: add basic support for Trusted Foundations
2013-12-13 12:50:30 -07:00
include
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
2014-04-07 13:52:12 +01:00
kernel
Merge branch 'sched/urgent' into sched/core
2014-03-11 11:34:27 +01:00
kvm
arm/arm64: KVM: detect CPU reset on CPU_PM_EXIT
2014-02-27 19:27:10 +01:00
lib
ARM: 7877/1: use built-in byte swap function
2013-12-29 12:32:45 +00:00
mach-at91
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
mach-bcm
ARM: pinctrl: Add Broadcom Capri pinctrl driver
2014-01-16 14:25:38 +01:00
mach-bcm2835
ARM: bcm2835: Fix grammar in help message
2014-01-02 12:07:52 -08:00
mach-berlin
ARM: add initial support for Marvell Berlin SoCs
2013-12-13 16:31:07 +01:00
mach-clps711x
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
mach-cns3xxx
…
mach-davinci
ARM: davinci: da850: update SATA AHCI support
2014-03-25 15:17:13 -04:00
mach-dove
…
mach-ebsa110
…
mach-efm32
ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs
2013-12-16 17:51:33 +01:00
mach-ep93xx
…
mach-exynos
Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-01-24 15:51:02 -08:00
mach-footbridge
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-01-24 17:17:30 -08:00
mach-gemini
…
mach-highbank
Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next
2014-01-21 21:26:33 +00:00
mach-hisi
ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
2014-02-02 19:52:42 -08:00
mach-imx
Merge branch 'irq/for-gpio' into irq/core
2014-03-12 16:01:07 +01:00
mach-integrator
ARM: integrator: restore static map on the CP
2014-01-31 14:58:52 -08:00
mach-iop13xx
…
mach-iop32x
ARM: iop32x: fix power off handling for the EM7210 board
2014-01-31 14:58:53 -08:00
mach-iop33x
…
mach-ixp4xx
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
mach-keystone
ARM: keystone: config: fix build warning when CONFIG_DMADEVICES is not set
2014-01-31 15:03:53 -08:00
mach-kirkwood
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
2014-01-31 14:59:28 -08:00
mach-ks8695
ARM: ks8695: delete local <mach/gpio.h> header
2013-12-03 11:26:05 +01:00
mach-lpc32xx
ARM: lpc32xx: move custom GPIO header
2013-12-03 11:26:06 +01:00
mach-mmp
arm: mmp: Remove pointless fiddling with irq internals
2014-03-04 17:37:52 +01:00
mach-moxart
ARM: moxart: move DMA_OF selection to driver
2014-02-02 19:52:45 -08:00
mach-msm
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:49:36 -08:00
mach-mv78xx0
ARM: mv78xx0: delete local <mach/gpio.h> header
2013-12-03 11:26:06 +01:00
mach-mvebu
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
2014-01-31 14:59:28 -08:00
mach-mxs
…
mach-netx
…
mach-nomadik
ARM: nomadik: get rid of explicit ethernet GPIO management
2013-11-28 21:08:42 +01:00
mach-nspire
…
mach-omap1
arm: omap: Fix typo in ams-delta-fiq.c
2014-03-20 12:44:02 +01:00
mach-omap2
Merge tag 'omap-for-v3.14/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
2014-02-28 16:01:28 +01:00
mach-orion5x
…
mach-picoxcell
…
mach-prima2
ARM: clean up cache handling in platform code
2013-12-11 16:24:34 -08:00
mach-pxa
Merge tag 'pwm_pxa_for_v3.14' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into fixes
2014-02-18 15:32:21 -08:00
mach-realview
…
mach-rockchip
…
mach-rpc
…
mach-s3c24xx
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:36:55 -08:00
mach-s3c64xx
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:36:55 -08:00
mach-s5p64x0
…
mach-s5pc100
…
mach-s5pv210
…
mach-sa1100
ARM: 7991/1: sa1100: fix compile problem on Collie
2014-03-07 22:04:08 +00:00
mach-shmobile
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:00:07 -07:00
mach-socfpga
arm: socfpga: Enable ARM_TWD for socfpga
2013-12-03 14:19:48 -08:00
mach-spear
…
mach-sti
ARM: clean up cache handling in platform code
2013-12-11 16:24:34 -08:00
mach-sunxi
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
mach-tegra
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-02-23 17:38:04 -08:00
mach-u300
ARM: u300: move timer driver to clocksource
2014-03-11 23:04:43 +01:00
mach-ux500
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:45:38 -08:00
mach-versatile
ARM: versatile: move GPIO2 and GPIO3 to core
2013-12-20 18:22:47 +01:00
mach-vexpress
…
mach-virt
…
mach-vt8500
…
mach-w90x900
…
mach-zynq
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:00:07 -07:00
mm
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-03-07 17:39:32 -08:00
net
bpf: do not use reciprocal divide
2014-01-15 17:02:08 -08:00
nwfpe
…
oprofile
…
plat-iop
Merge branch 'soc/sched_clock' into next/soc
2013-12-06 08:05:55 -08:00
plat-omap
Merge branch 'efm32/soc' into next/soc
2013-12-20 08:59:30 -08:00
plat-orion
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
2014-01-31 14:59:28 -08:00
plat-pxa
ARM: pxa: remove IRQF_DISABLED
2013-12-11 17:32:41 -08:00
plat-samsung
Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd
2014-01-28 18:56:37 -08:00
plat-versatile
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
tools
…
vfp
…
xen
xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_override
2014-03-18 14:40:19 +00:00
Kconfig
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-03-07 17:39:32 -08:00
Kconfig-nommu
…
Kconfig.debug
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-01-23 18:40:49 -08:00
Makefile
Merge branches 'fixes' and 'misc' into for-linus
2014-01-28 21:38:48 +00:00