Greg Kroah-Hartman e40bffaeae Merge 3.14-rc7 into staging-next ...

This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-03-17 11:27:39 -07:00

..

acpi

Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'

2014-01-29 11:47:18 +01:00

asm-generic

mm: Use ptep/pmdp_set_numa() for updating _PAGE_NUMA bit

2014-02-17 11:19:36 +11:00

clocksource

…

crypto

…

drm

Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes

2014-02-19 08:21:26 +10:00

dt-bindings

clk: tegra124: remove gr2d and gr3d clocks

2014-02-20 19:10:58 +02:00

keys

…

kvm

ARM: KVM: fix non-VGIC compilation

2014-03-06 09:47:42 +01:00

linux

Merge 3.14-rc7 into staging-next

2014-03-17 11:27:39 -07:00

math-emu

…

media

[media] of: move common endpoint parsing to drivers/of

2014-03-06 17:41:48 +01:00

memory

…

misc

…

net

tcp: tcp_release_cb() should release socket ownership

2014-03-11 16:45:59 -04:00

pcmcia

…

ras

…

rdma

IB: Report using RoCE IP based gids in port caps

2014-02-13 14:46:03 -08:00

rxrpc

…

scsi

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

2014-01-31 15:31:23 -08:00

sound

ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions

2014-02-20 18:40:07 +09:00

target

iscsi/iser-target: Fix isert_conn->state hung shutdown issues

2014-03-04 17:54:09 -08:00

trace

Merge tag 'nfs-for-3.14-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2014-03-09 19:17:39 -07:00

uapi

asm-generic: add sched_setattr/sched_getattr syscalls

2014-02-24 11:55:20 +00:00

video

…

xen

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

2014-02-14 10:45:18 -08:00

Kbuild

…