summaryrefslogtreecommitdiff
path: root/fs/jbd2/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-15 05:19:11 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-15 05:19:11 (GMT)
commit80f76319634fc62befd440b328042dbd54e3b6f8 (patch)
treee786c2ca89641d38ca5ea90a7a44b2edf57ade14 /fs/jbd2/Makefile
parent241903641111803807c90016866d88d7ef8c9347 (diff)
parent7a1a47ce35821b40f5b2ce46379ba14393bc3873 (diff)
downloadlinux-80f76319634fc62befd440b328042dbd54e3b6f8.tar.xz
Merge tag 'stm-for-greg-20160714' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes: intel_th: Fixes -t://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git tags/stm-for-greg-20160714 stable These are: * a fix for a modprobe time deadlock * a new PCI ID for Kaby Lake PCH-H
Diffstat (limited to 'fs/jbd2/Makefile')
0 files changed, 0 insertions, 0 deletions