Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers
authorOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:58:28 +0000 (18:58 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:58:28 +0000 (18:58 -0700)
commit1247034ea6515d25a80220915820aa61891a78a1
tree4cb5a05462bc5ef4c36ca8ef154673e3a7d22198
parent38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2
parent4a3ae9324ebeb9715369d2bca799bfd7dcff6dd7
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 <olof@lixom.net>
Conflicts:
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x25ek.dts
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/sama5d3xcm.dtsi
drivers/usb/gadget/Kconfig
drivers/usb/gadget/atmel_usba_udc.c