diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:57:51 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:57:51 +0200 |
commit | 19915e623458004547c1c2490b09bb923fe69337 (patch) | |
tree | b794a81ddf083ed08a5bb32820c2dd0121ed74b2 /scripts/Makefile.modpost | |
parent | Merge tag 'usb-serial-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | Linux 4.1-rc7 (diff) | |
download | linux-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