diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-09 00:07:32 -0800 |
commit | 64576e439709738c0f55ab60cdba0ad18d5aa24e (patch) | |
tree | 031394615b00dacbcec5c9e4b99f4494992ce375 /arch/arm/mach-prima2/common.h | |
parent | 3d7e0207ced354d1647195f53bcc670f9756c649 (diff) | |
parent | c0f8a48723d1e7ec48f65c72f880bc49edea9a4a (diff) | |
download | talos-obmc-linux-64576e439709738c0f55ab60cdba0ad18d5aa24e.tar.gz talos-obmc-linux-64576e439709738c0f55ab60cdba0ad18d5aa24e.zip |
Merge branch 'qcom/drivers' into next/drivers
* qcom/drivers:
tty: serial: Limit msm_serial_hs driver to platforms that use it
mmc: msm_sdcc: Limit driver to platforms that use it
usb: phy: msm: Move mach dependent code to platform data
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-prima2/common.h')
0 files changed, 0 insertions, 0 deletions