Merge tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:43:34 +0000 (14:43 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 21:43:34 +0000 (14:43 -0700)
Merge "DaVinci board changes for v3.16" from Sekhar Nori:

This patch clean-up an unused #define from code.

* tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge