Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 19:35:59 +0000 (12:35 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 19:35:59 +0000 (12:35 -0700)

Trivial merge