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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

2013-10-23 16:49:34 -04:00

..

arc

…

arm

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

2013-09-06 13:30:06 -07:00

ata

…

bus

…

c6x

…

clock

Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

2013-09-09 15:49:04 -07:00

cpufreq

…

crypto

…

dma

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2013-09-10 13:37:36 -07:00

drm/tilcdc

…

extcon

…

fb

…

gpio

Merge tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2013-09-07 10:53:00 -07:00

gpu

Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

2013-09-09 15:49:04 -07:00

hid

…

hwmon

…

hwrng

…

i2c

…

iio

iio: add Bosch BMA180 acceleration sensor driver

2013-08-28 20:12:22 +01:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2013-09-07 10:38:46 -07:00

interrupt-controller

…

iommu

…

leds

leds-pca9633: Rename to leds-pca963x

2013-08-26 17:22:14 -07:00

lpddr2

…

media

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

2013-09-06 13:26:27 -07:00

memory-controllers

…

metag

…

mfd

Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

2013-09-07 20:14:19 -07:00

mips

…

misc

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

2013-09-06 13:26:27 -07:00

mmc

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-10-02 21:48:32 -07:00

mtd

…

net

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

2013-10-01 17:06:14 -04:00

nvec

…

pci

dts: Fix misspelling of Synopsys

2013-09-24 21:13:38 -05:00

pinctrl

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

2013-09-06 13:26:27 -07:00

power

…

power_supply

…

powerpc

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2013-09-06 10:49:42 -07:00

pps

…

pwm

Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

2013-09-09 15:49:04 -07:00

regulator

Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

2013-09-07 20:14:19 -07:00

reset

…

rng

…

rtc

drivers/rtc/rtc-palmas.c: support for backup battery charging

2013-09-11 15:58:55 -07:00

serial

tty: ar933x_uart: move devicetree binding documentation

2013-09-26 12:33:49 -07:00

serio

dts: Deprecate ALTR as a vendor prefix

2013-08-29 12:58:55 -07:00

sound

ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver

2013-09-06 10:29:58 +01:00

spi

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

2013-09-06 13:26:27 -07:00

staging

…

thermal

…

timer

clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding

2013-09-02 21:44:58 +02:00

ufs

…

usb

Merge tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2013-09-03 11:36:27 -07:00

video

…

virtio

…

w1

…

watchdog

…

x86

…

eeprom.txt

…

marvell.txt

…

open-pic.txt

…

resource-names.txt

…

vendor-prefixes.txt

Merge tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2013-09-07 10:53:00 -07:00

xilinx.txt

…