Jens Axboe b207892b06 Merge branch 'for-linus' into for-3.18/core ...

A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.

Signed-off-by: Jens Axboe <axboe@fb.com>

Conflicts:
	block/scsi_ioctl.c

2014-09-11 09:31:18 -06:00

..

acpi

Merge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-08-06 20:34:19 -07:00

asm-generic

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

2014-08-08 18:00:35 -07:00

clocksource

ARM: pxa: Add non device-tree timer link to clocksource

2014-07-23 12:02:39 +02:00

crypto

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2014-08-06 08:06:39 -07:00

drm

drm/radeon: add additional SI pci ids

2014-08-22 10:47:59 -04:00

dt-bindings

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

2014-08-11 07:14:01 -07:00

keys

Merge remote-tracking branch 'integrity/next-with-keys' into keys-next

2014-07-22 21:54:43 +01:00

kvm

…

linux

Merge branch 'for-linus' into for-3.18/core

2014-09-11 09:31:18 -06:00

math-emu

…

media

[media] media: atmel-isi: add v4l2 async probe support

2014-07-30 19:35:06 -03:00

memory

…

misc

…

net

tcp: don't allow syn packets without timestamps to pass tcp_tw_recycle logic

2014-08-14 14:38:54 -07:00

pcmcia

…

ras

…

rdma

Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next

2014-08-14 08:58:04 -07:00

rxrpc

…

scsi

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

2014-08-15 18:28:58 -06:00

soc/tegra

…

sound

Merge tag 'asoc-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2014-08-04 18:28:21 +02:00

target

…

trace

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

2014-08-14 10:14:07 -06:00

uapi

Merge branch 'akpm' (fixes from Andrew Morton)

2014-08-29 16:28:29 -07:00

video

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

2014-08-08 18:09:33 -07:00

xen

Merge tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2014-08-07 11:33:15 -07:00

Kbuild

…