mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
5cce1cf718b02c8ea89576230db2bc2fc2e2a35a
linux/arch/arm
History
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
boot
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-01-27 16:59:56 -08:00
common
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
configs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-01-27 16:59:56 -08:00
crypto
crypto: arm - replace memset by memzero_explicit
2014-12-02 22:55:51 +08:00
firmware
…
include
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-01-15 00:53:17 -05:00
kernel
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-01-24 09:57:01 +12:00
kvm
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2014-12-18 16:05:28 -08:00
lib
ARM: 8225/1: Add unwinding support for memory copy functions
2014-11-27 16:00:25 +00:00
mach-asm9260
ARM: add mach-asm9260
2014-11-28 15:06:38 +01:00
mach-at91
ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
2015-01-12 15:50:23 +01:00
mach-axxia
…
mach-bcm
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-12-10 08:38:57 -08:00
mach-berlin
…
mach-clps711x
…
mach-cns3xxx
…
mach-davinci
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
mach-dove
…
mach-ebsa110
…
mach-efm32
…
mach-ep93xx
arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers
2014-11-28 12:34:08 +01:00
mach-exynos
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-18 20:28:33 -08:00
mach-footbridge
…
mach-gemini
…
mach-highbank
…
mach-hisi
…
mach-imx
Revert "ARM: imx: add FEC sleep mode callback function"
2015-01-08 20:05:19 -08:00
mach-integrator
…
mach-iop13xx
…
mach-iop32x
…
mach-iop33x
…
mach-ixp4xx
…
mach-keystone
ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-13 00:42:49 +01:00
mach-ks8695
…
mach-lpc32xx
…
mach-mediatek
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-12-09 14:57:37 -08:00
mach-meson
…
mach-mmp
Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux
2014-12-20 16:42:36 -08:00
mach-moxart
…
mach-msm
…
mach-mv78xx0
…
mach-mvebu
Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes
2015-01-18 16:46:31 -08:00
mach-mxs
…
mach-netx
…
mach-nomadik
…
mach-nspire
…
mach-omap1
ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-13 00:42:49 +01:00
mach-omap2
ARM: OMAP: Work around hardcoded interrupts
2015-01-17 08:56:12 -08:00
mach-orion5x
…
mach-picoxcell
…
mach-prima2
…
mach-pxa
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
mach-qcom
…
mach-realview
…
mach-rockchip
ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288
2015-01-16 19:10:39 -08:00
mach-rpc
…
mach-s3c24xx
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
mach-s3c64xx
…
mach-s5pv210
…
mach-sa1100
arm: sa1100: move irda header to linux/platform_data
2014-12-30 18:44:07 -05:00
mach-shmobile
Merge tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
2015-01-21 17:15:49 -08:00
mach-socfpga
…
mach-spear
…
mach-sti
…
mach-sunxi
…
mach-tegra
Merge tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-10 21:17:00 -08:00
mach-u300
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
mach-ux500
…
mach-versatile
…
mach-vexpress
ARM: vexpress: Enable regulator framework when MMCI is in use
2014-11-28 21:57:07 +01:00
mach-vt8500
…
mach-w90x900
…
mach-zynq
ARM: zynq: Remove secondary_startup() declaration from header
2014-12-01 09:32:22 +01:00
mm
ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error
2015-01-09 20:44:12 +00:00
net
…
nwfpe
…
oprofile
…
plat-iop
…
plat-omap
…
plat-orion
Merge tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2014-12-10 21:17:00 -08:00
plat-pxa
…
plat-samsung
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-12-14 16:10:09 -08:00
plat-versatile
ARM: vexpress: Remove non-DT code
2014-11-28 16:08:16 +01:00
tools
…
vfp
…
xen
xen/arm: introduce GNTTABOP_cache_flush
2014-12-04 12:41:54 +00:00
Kconfig
Merge branch 'akpm' (second patch-bomb from Andrew)
2014-12-13 13:00:36 -08:00
Kconfig-nommu
…
Kconfig.debug
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-12-14 16:43:47 -08:00
Makefile
…