malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-03-27 22:54:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
msm-4.14/arch/arm
History
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
boot
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-12 13:19:14 -04:00
common
ARM: 8032/1: bL_switcher: fix validation check before its activation
2014-04-22 22:23:59 +01:00
configs
ARM Versatile Express fixes for 3.15
2014-04-24 23:46:58 +02:00
crypto
…
firmware
…
include
Merge branch 'safe-dirty-tlb-flush'
2014-04-27 15:08:12 -07:00
kernel
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2014-04-27 12:55:04 -07:00
kvm
arm: KVM: fix possible misalignment of PGDs and bounce page
2014-04-28 03:21:48 -07:00
lib
ARM: 7990/1: asm: rename logical shift macros push pull into lspush lspull
2014-02-25 11:33:57 +00:00
mach-at91
First found of IIO fixes for the 3.15 cycle.
2014-04-22 21:29:20 -07:00
mach-bcm
ARM: SoC specific changes
2014-04-05 14:19:54 -07:00
mach-berlin
…
mach-clps711x
ARM: SoC specific changes
2014-04-05 14:19:54 -07:00
mach-cns3xxx
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-davinci
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-dove
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-ebsa110
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-efm32
…
mach-ep93xx
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-exynos
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-footbridge
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-gemini
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-highbank
…
mach-hisi
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-imx
ARM: i.MX6: ipu_di_sel clocks can set parent rates
2014-04-15 11:13:22 +08:00
mach-integrator
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-iop13xx
…
mach-iop32x
…
mach-iop33x
…
mach-ixp4xx
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-keystone
ARM: SoC: device tree changes
2014-04-05 15:29:04 -07:00
mach-kirkwood
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-ks8695
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-lpc32xx
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-mmp
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-moxart
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-msm
ARM: SoC specific changes
2014-04-05 14:19:54 -07:00
mach-mv78xx0
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-mvebu
ARM: SoC specific changes
2014-04-05 14:19:54 -07:00
mach-mxs
ARM: SoC: device tree changes
2014-04-05 15:29:04 -07:00
mach-netx
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-nomadik
…
mach-nspire
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-omap1
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-omap2
ARM: OMAP2+: Fix GPMC remap for devices using an offset
2014-04-23 11:09:22 -07:00
mach-orion5x
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-picoxcell
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
mach-prima2
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
mach-pxa
ARM: pxa: hx4700.h: include "irqs.h" for PXA_NR_BUILTIN_GPIO
2014-04-24 15:26:39 +02:00
mach-qcom
…
mach-realview
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-rockchip
ARM: rockchip: fix copy'n'paste error in smp error messages
2014-04-15 11:17:00 +02:00
mach-rpc
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-s3c24xx
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
mach-s3c64xx
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-s5p64x0
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-s5pc100
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-s5pv210
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mach-sa1100
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-shmobile
ARM: SoC fixes for 3.15-rc3:
2014-04-25 13:02:02 -07:00
mach-socfpga
The clock framework changes for 3.15 look similar to past pull requests.
2014-04-05 18:39:18 -07:00
mach-spear
ARM Versatile Express fixes for 3.15
2014-04-24 23:46:58 +02:00
mach-sti
Merge branch 'cleanup/kconfig' into next/drivers
2014-03-18 16:25:47 +01:00
mach-sunxi
ARM: SoC specific changes
2014-04-05 14:19:54 -07:00
mach-tegra
ARM: tegra: remove TEGRA_EMC_SCALING_ENABLE
2014-04-24 15:29:12 +02:00
mach-u300
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-ux500
ARM: SoC: device tree changes
2014-04-05 15:29:04 -07:00
mach-versatile
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
mach-vexpress
ARM: vexpress/TC2: Convert OPP voltage to uV before storing
2014-04-24 17:20:50 +01:00
mach-vt8500
…
mach-w90x900
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00
mach-zynq
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
mm
Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2014-04-24 09:58:57 -07:00
net
net: filter: add jited flag to indicate jit compiled filters
2014-03-31 00:45:08 -04:00
nwfpe
…
oprofile
…
plat-iop
ARM: 8000/1: misc: remove deprecated IRQF_DISABLED
2014-03-12 10:32:38 +00:00
plat-omap
ARM: SoC: device tree changes
2014-04-05 15:29:04 -07:00
plat-orion
ARM: SoC: driver changes
2014-04-05 15:37:40 -07:00
plat-pxa
…
plat-samsung
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
plat-versatile
…
tools
…
vfp
ARM: 8026/1: Fix emulation of multiply accumulate instructions
2014-04-14 23:28:24 +01:00
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-04-27 12:55:04 -07:00
Kconfig-nommu
…
Kconfig.debug
ARM: 8024/1: Keep DEBUG_UART_{PHYS,VIRT} entries sorted
2014-04-14 23:28:23 +01:00
Makefile
ARM: SoC: cleanups for 3.15
2014-04-05 13:51:19 -07:00