Linus Torvalds 6fb11e6508 Merge branch 'akpm' (patches from Andrew) ... Merge misc fixes from Andrew Morton: "Six fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock reiserfs: fix dereference of ERR_PTR ratelimit: fix bug in time interval by resetting right begin time mm: fix kernel crash in khugepaged thread mm: fix mlock accouting thp: change pmd_trans_huge_lock() interface to return ptl		2016-01-22 09:54:34 -08:00
..
acpi	Merge branches 'acpica', 'acpi-video' and 'acpi-fan'	2016-01-21 00:41:59 +01:00
asm-generic	Merge branch 'akpm' (patches from Andrew)	2016-01-21 12:32:08 -08:00
clocksource
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-01-17 19:13:15 -08:00
drm	Merge tag 'topic/drm-misc-2016-01-17' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-01-18 07:01:16 +10:00
dt-bindings	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
keys	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next	2015-12-26 16:06:53 +11:00
kvm
linux	Merge branch 'akpm' (patches from Andrew)	2016-01-22 09:54:34 -08:00
math-emu
media	[media] media-entitiy: add a function to create multiple links	2016-01-11 12:19:26 -02:00
memory
misc
net	net: drop tcp_memcontrol.c	2016-01-20 17:09:18 -08:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'jejb-scsi' into misc	2016-01-07 15:51:13 -08:00
soc	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
sound	ALSA: hda_intel: add card number to irq description	2016-01-12 21:05:16 +01:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-01-20 17:20:53 -08:00
trace	mm: fix kernel crash in khugepaged thread	2016-01-21 17:20:51 -08:00
uapi	Merge branch 'for-4.5/nvme' of git://git.kernel.dk/linux-block	2016-01-21 19:58:02 -08:00
video	omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h	2015-12-29 11:07:46 +02:00
xen	Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block	2016-01-21 18:19:38 -08:00
Kbuild