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

Conflicts:
	drivers/net/ethernet/cadence/macb.c

Overlapping changes in macb driver, mostly fixes and cleanups
in 'net' overlapping with the integration of at91_ether into
macb in 'net-next'.

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

2015-03-09 23:38:02 -04:00

..

accessibility

…

acpi

Merge branch 'acpi-video'

2015-03-06 01:29:16 +01:00

amba

ARM: 8256/1: driver coamba: add device binding path 'driver_override'

2015-02-10 10:23:15 +00:00

android

android: binder: fix binder mmap failures

2015-03-01 18:43:51 -08:00

ata

sata-fsl: Apply link speed limits

2015-03-02 12:08:43 -05:00

atm

…

auxdisplay

…

base

Merge branches 'pm-domains' and 'pm-cpufreq'

2015-03-06 01:29:31 +01:00

bcma

bcma: prepare Kconfig symbol for PCI driver

2015-03-05 14:11:45 +02:00

block

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2015-02-28 10:21:57 -08:00

bluetooth

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

2015-03-03 21:16:48 -05:00

bus

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

2015-02-17 09:27:54 -08:00

cdrom

…

char

tpm: fix call order in tpm-chip.c

2015-03-06 22:35:49 +01:00

clk

clk: at91: implement suspend/resume for the PMC irqchip

2015-03-04 22:11:17 +01:00

clocksource

clocksource: pxa: Fix section mismatch

2015-02-25 10:28:55 +01:00

connector

…

coresight

coresight: fix function etm_writel_cp14() parameter order

2015-02-04 10:42:55 -08:00

cpufreq

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

2015-03-06 13:43:33 -08:00

cpuidle

cpuidle / sleep: Use broadcast timer for states that stop local timer

2015-03-05 23:13:19 +01:00

crypto

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

2015-02-18 08:49:20 -08:00

dca

…

devfreq

Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'

2015-02-13 21:39:06 +01:00

dio

…

dma

dmaengine: mmp_pdma: fix warning about slave caps

2015-03-05 22:15:35 +05:30

dma-buf

…

edac

Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

2015-02-19 11:18:14 -08:00

eisa

…

extcon

…

firewire

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

2015-03-03 21:16:48 -05:00

firmware

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

2015-03-02 14:18:57 +01:00

fmc

…

gpio

gpio: tps65912: fix wrong container_of arguments

2015-02-23 15:40:32 +01:00

gpu

Merge tag 'drm-intel-fixes-2015-03-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes

2015-03-07 07:40:17 +10:00

hid

HID: microsoft: Add ID for NE7K wireless keyboard

2015-02-23 15:28:40 +01:00

hsi

…

hv

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

2015-02-15 10:48:44 -08:00

hwmon

hwmon: (ads7828) Check return value of devm_regmap_init_i2c

2015-02-22 20:10:30 -08:00

hwspinlock

…

i2c

i2c: designware-baytrail: baytrail_i2c_acquire() might sleep

2015-03-07 01:08:26 +01:00

ide

…

idle

intel_idle: Add ->enter_freeze callbacks

2015-02-15 19:40:09 +01:00

iio

Merge tag 'iio-fixes-for-4.0b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

2015-02-28 07:19:27 -08:00

infiniband

Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-22 17:42:14 -08:00

input

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

2015-03-09 18:06:13 -07:00

iommu

Merge tag 'iommu-updates-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-02-12 09:16:56 -08:00

ipack

…

irqchip

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

2015-02-21 19:41:38 -08:00

isdn

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

2015-03-03 21:16:48 -05:00

leds

leds: leds-gpio: Pass on error codes unmodified

2015-02-02 14:36:10 -08:00

lguest

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-02-18 09:24:01 -08:00

macintosh

…

mailbox

Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration

2015-02-11 12:56:40 -08:00

mcb

mcb: Fix error path of mcb_pci_probe

2015-02-03 15:48:51 -08:00

md

md: mark some attributes as pre-alloc

2015-02-25 11:38:46 +11:00

media

net: Kill dev_rebuild_header

2015-03-02 16:43:41 -05:00

memory

memory/fsl-corenet-cf: Add t1040 support

2015-01-29 22:57:43 -06:00

memstick

…

message

i2o: move to staging

2015-02-03 15:58:39 -08:00

mfd

Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-02-18 09:05:48 -08:00

misc

mei: make device disabled on stop unconditionally

2015-03-01 19:34:50 -08:00

mmc

Merge tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux

2015-02-21 12:30:30 -08:00

mtd

Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd

2015-02-18 08:01:44 -08:00

net

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

2015-03-09 23:38:02 -04:00

nfc

NFC: nci: Move NFCEE discovery logic

2015-02-04 09:15:18 +01:00

ntb

…

nubus

…

of

Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2015-02-18 09:43:46 -08:00

oprofile

…

parisc

…

parport

…

pci

PCI: versatile: Update for list_for_each_entry() API change

2015-02-28 00:47:00 +01:00

pcmcia

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

2015-02-17 09:38:59 -08:00

phy

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

2015-02-15 10:24:55 -08:00

pinctrl

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

2015-02-11 11:23:13 -08:00

platform

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

2015-02-21 11:12:07 -08:00

pnp

Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'

2015-02-21 04:29:16 +01:00

power

power_supply: 88pm860x: Fix leaked power supply on probe fail

2015-01-28 15:08:10 +01:00

powercap

…

pps

…

ps3

…

ptp

…

pwm

pwm: tegra: Use NSEC_PER_SEC

2015-02-18 08:40:29 +01:00

rapidio

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

2015-02-18 08:49:20 -08:00

ras

…

regulator

Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus

2015-03-06 21:10:30 +00:00

remoteproc

…

reset

…

rpmsg

…

rtc

Merge branch 'irq-pm'

2015-03-06 01:29:05 +01:00

s390

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

2015-03-09 23:38:02 -04:00

sbus

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-02-21 19:16:42 -08:00

sfi

…

sh

drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd

2015-02-24 07:26:12 +09:00

sn

…

soc

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

2015-02-17 09:38:59 -08:00

spi

Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/dw', 'spi/fix/img-spfi', 'spi/fix/pl022' and 'spi/fix/ti-qspi' into spi-linus

2015-03-06 21:10:56 +00:00

spmi

…

ssb

ssb: Silence warning for unknown backplane revision

2015-03-03 15:49:40 +02:00

staging

staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel

2015-03-01 19:25:59 -08:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-02-21 13:21:19 -08:00

tc

…

thermal

thermal: Make sysfs attributes of cooling devices default attributes

2015-03-05 01:47:57 -04:00

thunderbolt

…

tty

Merge tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2015-03-08 12:25:40 -07:00

uio

…

usb

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

2015-03-08 12:47:18 -07:00

uwb

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

2015-02-15 10:24:55 -08:00

vfio

vfio-pci: Add device request interface

2015-02-10 12:38:14 -07:00

vhost

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

2015-03-03 21:16:48 -05:00

video

OMAPDSS: fix regression with display sysfs files

2015-02-26 10:23:15 +02:00

virt

…

virtio

virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.

2015-02-17 16:19:29 +10:30

vlynq

…

vme

…

w1

…

watchdog

watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND

2015-03-06 00:46:31 +01:00

xen

xen-scsiback: mark pvscsi frontend request consumed only after last read

2015-02-23 16:30:25 +00:00

zorro

…

Kconfig

i2o: move to staging

2015-02-03 15:58:39 -08:00

Makefile

…