summaryrefslogtreecommitdiff
path: root/arch/avr32
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-14 02:22:54 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-14 02:22:54 +0400
commite17f8af316525c2a795bb314dfcc23201fb51ef4 (patch)
tree99ea9c56dc9e8fc6485d0513e71aacdb50a19792 /arch/avr32
parenta276400d14bb5b98a5db1d87bbee7b1621abe4a1 (diff)
parent0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b (diff)
downloadlinux-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.xz
Merge branch 'usb-linus' into usb-next
This is to pick up the changes to the option driver, which are needed for follow-on patches from Johan. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/avr32')
0 files changed, 0 insertions, 0 deletions