From: Olof Johansson Date: Sat, 15 Jun 2013 01:58:28 +0000 (-0700) Subject: Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~68^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1247034ea6515d25a80220915820aa61891a78a1;p=pandora-kernel.git Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers From Nicolas Ferre: Adding the DT support to USB gadget High-Speed aka usba. * tag 'at91-drivers' of git://github.com/at91linux/linux-at91: USB: gadget: atmel_usba: add DT support USB: gadget: atmel_usba: allow multi instance USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc ARM: at91: udpate defconfigs ARM: at91: dt: switch to standard IRQ flag defines ARM: at91: dt: switch to pinctrl to pre-processor ARM: at91: dt: add pinctrl pre-processor define ARM: at91: dt: switch to standard GPIO flag defines. ARM: at91: dt: use #include for all device trees Signed-off-by: Olof Johansson Conflicts: arch/arm/boot/dts/at91sam9260.dtsi arch/arm/boot/dts/sama5d3.dtsi --- 1247034ea6515d25a80220915820aa61891a78a1 Reading git-diff-tree failed