Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat...

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  usb: musb: dsps: fix the base address for accessing the mode register
  ARM: dts: am335x-evmsk: enable second USB controller
  mm: dmapool: add/remove sysfs file outside of the pool lock lock

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/am335x-evmsk.dts
Simple merge

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge