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

Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

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

2015-07-31 23:52:20 -07:00

..

arc

ARCv2: [axs103] Support ARC SDP FPGA platform for HS38x cores

2015-06-25 06:00:20 +05:30

arm

Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

2015-07-09 15:08:44 -07:00

ata

devicetree:bindings: add devicetree bindings for ceva ahci

2015-06-10 11:15:17 +09:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-04-22 09:18:17 -07:00

c6x

Documentation: devicetree: Fix double words in Doumentation/devicetree

2015-01-28 15:13:11 -07:00

clock

Merge tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2015-07-01 19:22:00 -07:00

cpufreq

…

cris

Add binding documentation for CRIS

2015-03-25 10:42:53 +01:00

crypto

crypto: marvell/cesa - add DT bindings documentation

2015-06-19 22:18:06 +08:00

devfreq/event

PM / devfreq: event: Add documentation for exynos-ppmu devfreq-event driver

2015-01-30 17:56:42 +09:00

dma

Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma

2015-06-29 09:44:45 -07:00

drm

drm/imx: parallel-display: fix drm_panel support

2015-07-10 11:02:31 +02:00

edac

EDAC, xgene: Fix cpuid abuse

2015-06-02 19:07:50 +02:00

extcon

extcon: usb-gpio: Introduce gpio usb extcon driver

2015-02-24 09:00:53 +09:00

fb

…

fpga

doc: add bindings document for altera fpga manager

2015-01-13 13:58:01 -06:00

fuse

ARM: tegra: Use lower-case hexadecimal digits

2015-05-04 13:25:19 +02:00

gpio

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

gpu

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-02-16 15:48:00 -08:00

h8300

h8300: kernel startup

2015-06-23 13:35:51 +09:00

hid

…

hsi

…

hwlock

DT: hwspinlock: add the CSR atlas7 hwspinlock bindings document

2015-06-12 10:48:51 +03:00

hwmon

hwmon: (ntc_thermistor) Add support for ncpXXwf104

2015-05-31 22:58:36 -07:00

hwrng

hwrng: iproc-rng200 - Add device tree bindings

2015-03-06 22:51:33 +11:00

i2c

Merge branch 'i2c/for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2015-06-25 18:42:39 -07:00

iio

iio: st_accel: support the LIS331DL sensor

2015-06-08 22:21:18 +01:00

input

Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2015-06-26 15:46:08 -07:00

interrupt-controller

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

iommu

iommu/arm-smmu: Skip the execution of CMD_PREFETCH_CONFIG

2015-07-08 17:24:39 +01:00

leds

DT: aat1290: Document handling external strobe sources

2015-06-22 13:55:28 -07:00

lpddr2

…

mailbox

dt: mailbox: Remove 'mbox-names property is discouraged' message from binding

2015-06-11 22:19:46 +05:30

media

[media] bdisp: add DT bindings documentation

2015-06-09 17:54:09 -03:00

memory-controllers

ARM: dts: am4372: Add emif node

2015-07-06 05:11:13 -07:00

metag

…

mfd

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2015-07-01 19:40:18 -07:00

mipi

…

mips

DEVICETREE: Add bindings for the SoC of the ATH79 family

2015-06-21 21:54:01 +02:00

misc

of: Document long-ram-code property in nvidia,tegra20-apbmisc

2015-05-04 14:21:20 +02:00

mmc

dts: mmc: fsl-imx-esdhc: remove fsl,cd-controller support

2015-07-24 10:18:39 +02:00

mtd

Merge tag 'v4.1-rc4' into MTD's -next

2015-05-18 10:50:43 -07:00

net

net: netcp: Fixes efuse mac addr swap on k2e and k2l

2015-07-29 17:16:03 -07:00

nios2

nios2: Device tree support

2014-12-08 12:56:01 +08:00

nvec

…

panel

drm/panel: simple: Add display timing for HannStar HSD100PXN1

2015-06-12 16:40:35 +02:00

pci

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:43:59 -07:00

phy

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

pinctrl

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2015-07-01 19:40:18 -07:00

power

Merge tag 'usb-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2015-06-26 15:59:26 -07:00

power_supply

power_supply: max17042: Add OF support for setting thresholds

2015-06-10 16:14:03 +02:00

powerpc

powerpc/fsl: Add FMan Port 10G compatibles

2015-06-05 01:53:52 -05:00

pps

…

pwm

Merge tag 'pwm/for-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2015-04-24 10:11:24 -07:00

regmap

…

regulator

Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next

2015-06-22 11:19:56 +01:00

remoteproc

Documentation: dt: add bindings for TI Wakeup M3 processor

2015-06-17 09:57:46 +03:00

reserved-memory

…

reset

Merge tag 'berlin-dt-4.2-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

2015-05-20 23:03:25 +02:00

rng

…

rtc

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:43:59 -07:00

security/tpm

tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy

2015-03-18 22:43:07 +01:00

serial

Merge tag 'omap-for-v4.2/wakeirq-drivers-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/late

2015-07-01 12:25:13 -07:00

serio

Input: serio - add support for Alwinner A10/A20 PS/2 controller

2015-01-26 23:10:13 -08:00

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:54:29 -07:00

sound

Merge remote-tracking branches 'asoc/fix/fsl-ssi', 'asoc/fix/intel', 'asoc/fix/intel-kconfig' and 'asoc/fix/mediatek' into asoc-linus

2015-07-24 16:18:20 +01:00

spi

DEVICETREE: Misc fix for the AR7100 SPI controller binding

2015-07-27 08:24:39 -05:00

spmi

spmi: pmic_arb: add support for hw version 2

2015-03-26 23:51:36 +01:00

staging/iio/adc

Merge tag 'iio-for-3.20a_take2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing

2015-01-21 10:13:37 +08:00

thermal

dt-bindings: Document the hi6220 thermal sensor bindings

2015-06-03 15:53:49 -07:00

timer

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:43:59 -07:00

ufs

…

usb

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

video

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-06-26 13:18:51 -07:00

virtio

…

w1

…

watchdog

watchdog: omap: use watchdog_init_timeout instead of open coding it

2015-06-22 15:54:04 +02:00

x86

…

xillybus

…

ABI.txt

…

btmrvl.txt

…

chosen.txt

of: Add bindings for chosen node, stdout-path

2014-12-03 23:12:35 +00:00

common-properties.txt

of: Document {little,big,native}-endian bindings

2015-04-14 19:35:44 -05:00

eeprom.txt

…

graph.txt

Documentation: of: fix typo in graph bindings

2015-01-13 13:55:22 -06:00

marvell.txt

…

open-pic.txt

…

resource-names.txt

…

submitting-patches.txt

dt: submitting-patches: clarify that DT maintainers are to be cced on bindings

2015-03-10 10:34:33 -05:00

unittest.txt

of/unittest: replace 'selftest' with 'unittest'

2015-03-25 00:53:29 -05:00

vendor-prefixes.txt

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2015-07-01 19:40:18 -07:00

xilinx.txt

…