summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile.modpost
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-08 19:57:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-08 19:57:51 +0200
commit19915e623458004547c1c2490b09bb923fe69337 (patch)
treeb794a81ddf083ed08a5bb32820c2dd0121ed74b2 /scripts/Makefile.modpost
parentMerge tag 'usb-serial-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentLinux 4.1-rc7 (diff)
downloadlinux-19915e623458004547c1c2490b09bb923fe69337.tar.xz
linux-19915e623458004547c1c2490b09bb923fe69337.zip
Merge 4.1-rc7 into usb-next
This resolves a merge issue in musb_core.c and we want the fixes that were in Linus's tree in this branch as well for testing. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/Makefile.modpost')
0 files changed, 0 insertions, 0 deletions