David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-08-26 16:37:08 -04:00

..

boot

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-26 16:37:08 -04:00

common

Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

2013-07-22 19:54:21 -07:00

configs

ARM: multi_v7_defconfig: Select USB chipidea driver

2013-07-23 12:18:02 -07:00

crypto

…

include

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

2013-08-16 16:52:29 -07:00

kernel

perf/arm: Fix armpmu_map_hw_event()

2013-08-13 16:57:24 -07:00

kvm

KVM: ARM: Squash len warning

2013-08-11 21:03:39 -07:00

lib

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-at91

ARM: at91: add missing uart clocks DT entries

2013-08-14 09:26:03 +02:00

mach-bcm

…

mach-bcm2835

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-clps711x

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-cns3xxx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-davinci

ARM: davinci: nand: specify ecc strength

2013-08-19 09:30:20 -07:00

mach-dove

Watchdog: allow orion_wdt to be built for Dove

2013-07-11 22:17:56 +02:00

mach-ebsa110

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-ep93xx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-exynos

Samsung fixes for v3.11

2013-07-24 17:06:58 -07:00

mach-footbridge

ARM: footbridge: fix overlapping PCI mappings

2013-07-22 20:00:47 -07:00

mach-gemini

…

mach-highbank

ARM: highbank: Only touch common coherency control register fields

2013-07-22 20:03:59 -07:00

mach-imx

The imx fixes for 3.11:

2013-07-22 19:58:02 -07:00

mach-integrator

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-iop13xx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-iop32x

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-iop33x

…

mach-ixp4xx

ARM: SoC fixes for 3.11-rc

2013-07-13 15:00:26 -07:00

mach-keystone

ARM: keystone: fix compilation warning

2013-07-23 11:03:54 -07:00

mach-kirkwood

Watchdog: allow orion_wdt to be built for Dove

2013-07-11 22:17:56 +02:00

mach-ks8695

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-lpc32xx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-mmp

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-msm

Fixes for MSM for 3.11

2013-08-04 13:34:57 -07:00

mach-mv78xx0

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-mvebu

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-mxs

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-07-09 18:24:39 -07:00

mach-netx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-nomadik

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-nspire

…

mach-omap1

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-omap2

ARM: SoC fixes for 3.11-rc

2013-08-22 10:44:44 -07:00

mach-orion5x

Watchdog: allow orion_wdt to be built for Dove

2013-07-11 22:17:56 +02:00

mach-picoxcell

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-prima2

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-pxa

can: mcp251x: Replace power callbacks with regulator API

2013-08-21 09:28:29 +02:00

mach-realview

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-rockchip

…

mach-rpc

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-s3c24xx

Samsung fixes for v3.11

2013-07-24 17:06:58 -07:00

mach-s3c64xx

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-s5p64x0

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-s5pc100

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-s5pv210

For the 3.11 merge we only have one new MFD driver for the Kontron PLD.

2013-07-10 11:10:27 -07:00

mach-sa1100

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-shark

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-shmobile

sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'

2013-08-20 17:10:41 -07:00

mach-socfpga

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-spear

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-sti

ARM: STi: remove sti_secondary_start from INIT section.

2013-08-04 13:40:55 -07:00

mach-sunxi

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-tegra

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-u300

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-ux500

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

mach-versatile

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-vexpress

ARM SoC specific changes

2013-07-02 13:43:38 -07:00

mach-virt

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-07-03 09:46:29 -07:00

mach-vt8500

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-w90x900

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

mach-zynq

ARM: zynq: fix compilation warning

2013-07-23 11:04:04 -07:00

mm

Merge branch 'security-fixes' into fixes

2013-08-01 20:51:13 +01:00

net

…

nwfpe

…

oprofile

…

plat-iop

reboot: arm: change reboot_mode to use enum reboot_mode

2013-07-09 10:33:29 -07:00

plat-omap

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-07-06 14:09:38 -07:00

plat-orion

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-07-06 14:09:38 -07:00

plat-pxa

…

plat-samsung

ARM: SAMSUNG: fix to support for missing cpu specific map_io

2013-07-30 13:30:57 +09:00

plat-versatile

arm: delete __cpuinit/__CPUINIT usage from all ARM users

2013-07-14 19:36:52 -04:00

tools

…

vfp

…

xen

Bug-fixes:

2013-08-21 16:38:33 -07:00

Kconfig

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

2013-08-02 14:37:45 -07:00

Kconfig-nommu

…

Kconfig.debug

ARM: document DEBUG_UNCOMPRESS Kconfig option

2013-07-22 12:03:50 +01:00

Makefile

ARM: Fix sorting of machine- initializers

2013-07-27 00:45:45 +01:00