David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c net/ipv4/tcp_metrics.c Overlapping changes between the "don't create two tcp metrics objects with the same key" race fix in net and the addition of the destination address in the lookup key in net-next. Minor overlapping changes in bnx2x driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-18 00:55:41 -08:00
..
boot	Samsung Clock fixes for 3.13-rc7	2014-01-05 21:36:43 -08:00
common	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-11-20 13:20:24 -08:00
configs	ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16	2013-12-03 12:39:14 -08:00
crypto	CRYPTO: Fix more AES build errors	2014-01-05 13:59:56 +00:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-14 14:42:42 -08:00
kernel	ARM: 7939/1: traps: fix opcode endianness when read from user memory	2014-01-11 12:06:59 +00:00
kvm	Fix percpu vmalloc allocations	2013-11-19 10:43:05 +02:00
lib	ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation	2013-11-30 22:21:03 +00:00
mach-at91	ARM: SoC fixes for 3.13-rc	2013-12-04 08:56:18 -08:00
mach-bcm	BCM changes for 3.13/soc. A number of cleanup related changes.	2013-10-30 14:03:39 -07:00
mach-bcm2835	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-12 10:02:59 +09:00
mach-clps711x
mach-cns3xxx
mach-davinci	This pull request includes a patch	2013-12-04 14:28:26 -08:00
mach-dove	ARM: driver updates for 3.13	2013-11-11 17:05:37 +09:00
mach-ebsa110
mach-ep93xx	usb: ohci: remove ep93xx bus glue platform driver	2013-10-29 16:43:37 -07:00
mach-exynos	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mach-footbridge	ARM: fix footbridge clockevent device	2013-12-29 12:41:20 +00:00
mach-gemini	GPIO bulk changes for the v3.13 development cycle	2013-11-12 15:50:46 +09:00
mach-highbank	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-01-16 08:26:00 +07:00
mach-imx	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-integrator	Few clock fixes, a runtime PM fix, and pinctrl-single fix along	2013-11-15 15:17:59 -08:00
mach-iop13xx	dmaengine: remove DMA unmap from drivers	2013-11-14 11:04:38 -08:00
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
mach-keystone	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
mach-kirkwood	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-ks8695
mach-lpc32xx
mach-mmp	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
mach-msm	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-12 10:36:00 +09:00
mach-mv78xx0
mach-mvebu	ARM: mvebu: support running big-endian	2013-10-19 20:46:34 +01:00
mach-mxs	ARM: SoC DT updates for 3.13	2013-11-11 17:34:56 +09:00
mach-netx
mach-nomadik
mach-nspire
mach-omap1	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-omap2	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-01-16 08:26:00 +07:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	ARM: pxa: fix USB gadget driver compilation regression	2013-12-28 15:18:34 -08:00
mach-realview
mach-rockchip	ARM: SoC board updates for 3.13	2013-11-11 16:57:16 +09:00
mach-rpc
mach-s3c24xx	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-s3c64xx	ARM: s3c64xx: dt: Fix boot failure due to double clock initialization	2013-12-13 21:48:25 -08:00
mach-s5p64x0	ARM: SAMSUNG: Initialize PWM backlight enable_gpio field	2013-10-16 09:05:57 +02:00
mach-s5pc100	ARM: SAMSUNG: Initialize PWM backlight enable_gpio field	2013-10-16 09:05:57 +02:00
mach-s5pv210	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
mach-sa1100	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mach-shmobile	ARM: shmobile: mackerel: Fix coherent DMA mask	2013-12-26 14:21:03 +09:00
mach-socfpga	arm: socfpga: Enable ARM_TWD for socfpga	2013-12-03 14:19:48 -08:00
mach-spear
mach-sti	ARM: SoC fixes for 3.13 merge window	2013-11-16 12:45:55 -08:00
mach-sunxi	ARM: sunxi: remove .init_time hooks	2013-10-28 10:19:45 -07:00
mach-tegra	ARM: tegra: add missing break to fuse initialization code	2013-12-11 17:09:11 -08:00
mach-u300	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
mach-ux500	Revert "ARM: ux500: Stop passing MMC's platform data for Device Tree boots"	2013-11-26 21:02:20 +01:00
mach-versatile
mach-vexpress	ARM: vexpress/TC2: Implement MCPM power_down_finish()	2013-11-25 14:12:14 -08:00
mach-virt
mach-vt8500
mach-w90x900
mach-zynq	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mm	Revert "ARM: 7908/1: mm: Fix the arm_dma_limit calculation"	2014-01-07 17:53:54 +00:00
net	bpf: do not use reciprocal divide	2014-01-15 17:02:08 -08:00
nwfpe
oprofile
plat-iop
plat-omap	ARM: OMAP2+: Disable POSTED mode for errata i103 and i767	2013-11-26 15:03:36 -08:00
plat-orion
plat-pxa
plat-samsung	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
plat-versatile	ARM: vexpress: add big endian support	2013-10-19 20:46:34 +01:00
tools
vfp	ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu	2013-10-30 22:10:10 +00:00
xen	arm: xen: foreign mapping PTEs are special.	2013-12-11 17:06:05 +00:00
Kconfig	Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm	2013-11-22 09:56:51 -08:00
Kconfig-nommu
Kconfig.debug	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
Makefile	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00