David S. Miller 296c10639a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ...

Conflicts:
	net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

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

2013-11-02 02:13:48 -04:00

..

acpi

ACPI / PM: Drop two functions that are not used any more

2013-10-17 15:44:48 +02:00

asm-generic

mm: Fix generic hugetlb pte check return type.

2013-10-02 20:02:35 -04:00

clocksource

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

2013-09-06 13:21:16 -07:00

crypto

crypto: scatterwalk - Add support for calculating number of SG elements

2013-08-21 21:27:58 +10:00

drm

Revert "drm: mark context support as a legacy subsystem"

2013-09-20 08:32:59 +10:00

dt-bindings

ARM: dts: Fix pinctrl mask for omap3

2013-10-08 10:37:29 -07:00

keys

…

kvm

ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256

2013-08-30 16:12:39 +03:00

linux

net: cdc_ncm: drop "extern" from header declarations

2013-11-02 02:02:04 -04:00

math-emu

…

media

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

2013-09-05 14:54:29 -07:00

memory

…

misc

…

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-11-02 02:13:48 -04:00

pcmcia

pcmcia/ds.h: introduce helper for pcmcia_driver module boilerplate

2013-03-15 12:26:03 -07:00

ras

edac: add support for error type "Info"

2013-02-21 14:16:27 -03:00

rdma

Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next

2013-09-03 09:01:08 -07:00

rxrpc

…

scsi

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

2013-09-12 16:11:45 -07:00

sound

ASoC: rcar: fixup generation checker

2013-10-11 19:52:32 +01:00

target

target/iscsi: Bump versions to v4.1.0

2013-09-10 20:23:37 -07:00

trace

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

2013-09-22 15:00:11 -07:00

uapi

net: sched: cls_bpf: add BPF-based classifier

2013-10-29 17:33:17 -04:00

video

Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2013-09-05 09:49:32 -07:00

xen

xen-netback: enable IPv6 TCP GSO to the guest

2013-10-17 15:35:17 -04:00

Kbuild

UAPI: remove empty Kbuild files

2013-04-30 17:04:09 -07:00