David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
at91
bcm
hisilicon
keystone
mmp
mvebu
mxs
qcom
rockchip
samsung
shmobile	clk: shmobile: clk-mstp: change to using clock-indices	2014-05-12 16:53:37 -07:00
sirf
socfpga	clk: socfpga: fix clock driver for 3.15	2014-04-30 11:44:01 -07:00
spear
st
sunxi
tegra	clk: tegra: Fix wrong value written to PLLE_AUX	2014-05-16 15:49:23 -07:00
ti	ARM: AM43xx: clk: Change the cpts ref clock source to dpll_core_m5 clk	2014-05-05 13:18:50 -04:00
ux500
versatile	vexpress: Initialise the sysregs before setting up the clocks	2014-05-04 11:35:29 +01:00
x86
zynq
clk-axi-clkgen.c
clk-bcm2835.c
clk-composite.c
clk-devres.c
clk-divider.c	clk: divider: Fix best div calculation for power-of-two and table dividers	2014-04-30 11:44:00 -07:00
clk-efm32gg.c
clk-fixed-factor.c
clk-fixed-rate.c
clk-gate.c
clk-highbank.c
clk-ls1x.c
clk-max77686.c
clk-moxart.c
clk-mux.c
clk-nomadik.c
clk-nspire.c
clk-ppc-corenet.c
clk-s2mps11.c
clk-si570.c
clk-si5351.c
clk-si5351.h
clk-twl6040.c
clk-u300.c
clk-vt8500.c
clk-wm831x.c
clk-xgene.c
clk.c	clk: Fix slab corruption in clk_unregister()	2014-04-30 11:44:05 -07:00
clk.h
clkdev.c
Kconfig
Makefile