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	clk: at91: optimization of the set_rate callback	2014-03-19 15:22:02 -07:00
bcm	clk: bcm281xx: don't use unnamed structs or unions	2014-04-30 11:43:58 -07:00
hisilicon	clk: hisilicon: fix warning from smatch	2014-03-20 19:05:39 -07:00
keystone	clk: keystone: gate: fix clk_init_data initialization	2014-02-10 15:17:43 -05:00
mmp	clk: mmp: try to use closer one when do round rate	2014-03-26 20:59:27 -07:00
mvebu	clock: mvebu new SoC changes for v3.15 (incremental pull #2)	2014-03-18 21:34:45 -07:00
mxs	ARM: mxs: remove custom .init_time hook	2013-09-29 21:09:34 +02:00
qcom	clk: qcom: Fix modular build	2014-01-17 13:39:42 -08:00
rockchip	clk: add support for Rockchip gate clocks	2013-06-20 15:58:27 -07:00
samsung	Exynos cleanup for v3.15	2014-03-29 02:03:39 +01:00
shmobile	clk: shmobile: clk-mstp: change to using clock-indices	2014-05-12 16:53:37 -07:00
sirf	clk: sirf: update copyright years to 2014	2014-03-26 21:47:35 -07:00
socfpga	clk: socfpga: fix clock driver for 3.15	2014-04-30 11:44:01 -07:00
spear	clk: SPEAr: Staticize clk_frac_ops	2013-12-19 11:45:17 -08:00
st	clk: st: Support for A9 MUX clocks	2014-03-25 15:59:23 -07:00
sunxi	clk: sunxi: fix thinko in comment	2014-03-19 12:35:07 -07:00
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	clk: ux500: Staticize ux500_twocell_get	2014-02-23 15:04:40 -08:00
versatile	vexpress: Initialise the sysregs before setting up the clocks	2014-05-04 11:35:29 +01:00
x86	ACPI / LPSS: add support for Intel BayTrail	2013-06-19 01:08:47 +02:00
zynq	The clock framework changes for 3.15 look similar to past pull requests.	2014-04-05 18:39:18 -07:00
clk-axi-clkgen.c	clk: axi-clkgen: Add support for v2	2014-02-26 17:02:29 -08:00
clk-bcm2835.c	ARM: bcm2835: remove custom .init_time hook	2013-09-29 21:09:24 +02:00
clk-composite.c	clk: composite: pass mux_hw into determine_rate	2014-01-15 07:48:03 -08:00
clk-devres.c	ARM: 7537/1: clk: Fix release in devm_clk_put()	2012-09-19 21:51:27 +01:00
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: new driver for efm32 SoC	2013-11-04 12:23:18 -08:00
clk-fixed-factor.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
clk-fixed-rate.c	clk: add accuracy support for fixed clock	2013-12-22 23:14:28 -08:00
clk-gate.c	clk: wrap I/O access for improved portability	2013-08-27 17:50:38 -07:00
clk-highbank.c	ARM: highbank: remove custom .init_time hook	2013-09-29 21:09:29 +02:00
clk-ls1x.c	clk: add Loongson1B clock support	2012-08-31 11:05:18 -07:00
clk-max77686.c	clk: max77686: Register OF clock provider	2014-01-08 09:57:07 -08:00
clk-moxart.c	clk: add MOXA ART SoCs clock driver	2014-03-18 17:13:14 -07:00
clk-mux.c	clk: wrap I/O access for improved portability	2013-08-27 17:50:38 -07:00
clk-nomadik.c	clk: nomadik: fix multiplatform problem	2014-02-26 11:14:44 -08:00
clk-nspire.c	clk: Add TI-Nspire clock drivers	2013-05-31 12:07:45 -07:00
clk-ppc-corenet.c	clk: mpc85xx: Update the driver to align to new clock bindings	2014-03-19 17:04:14 -07:00
clk-s2mps11.c	clk: s2mps11: Use of_get_child_by_name	2014-03-24 15:11:27 -07:00
clk-si570.c	clk: si570: Remove redundant of_match_ptr helper	2013-12-22 22:46:52 -08:00
clk-si5351.c	The second half of the clock framework pull requeust for 3.14 is	2014-01-28 18:44:53 -08:00
clk-si5351.h	clk: si5351: remove variant from platform_data	2014-01-27 11:20:22 -08:00
clk-twl6040.c	clk: use platform_{get,set}_drvdata()	2013-05-30 18:19:34 -07:00
clk-u300.c	clk: u300: Fix incorrect placement of __initconst	2013-08-27 18:34:09 -07:00
clk-vt8500.c	clk: vt8500: Staticize vtwm_pll_ops	2013-12-19 17:47:32 -08:00
clk-wm831x.c	clk: wm831x: get rid of the implementation of remove function	2013-10-02 01:23:34 -07:00
clk-xgene.c	clk: Add APM X-Gene SoC clock driver	2013-10-07 11:22:15 -07:00
clk.c	clk: Fix slab corruption in clk_unregister()	2014-04-30 11:44:05 -07:00
clk.h	clk: Provide not locked variant of of_clk_get_from_provider()	2013-12-04 17:19:30 +01:00
clkdev.c	clk: return probe defer when DT clock not yet ready	2014-02-24 17:14:56 -08:00
Kconfig	The clock framework changes for 3.15 look similar to past pull requests.	2014-04-05 18:39:18 -07:00
Makefile	The clock framework changes for 3.15 look similar to past pull requests.	2014-04-05 18:39:18 -07:00