summaryrefslogtreecommitdiff
path: root/drivers/spi/spi_mvf_dspi.c
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-05-15 16:44:05 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-05-15 16:44:05 +0200
commit768d4af538e6d1fbc3f3342d6179427fa3e22bfe (patch)
tree88b33e595162cfcc6e337a3ded520d5134da5592 /drivers/spi/spi_mvf_dspi.c
parenta0b49113b02cf13c3d5079f7f6ae1fcf63c9a953 (diff)
parentb2faeb5472fe71b505a103388b8a8540dbd47134 (diff)
Merge tag '3.0-vybrid-ts2.16' into colibri_vfColibri_VF_LinuxImageV2.2Beta1_20140603
3.0-vybrid-ts2.16 Conflicts: drivers/tty/serial/mvf.c
Diffstat (limited to 'drivers/spi/spi_mvf_dspi.c')
0 files changed, 0 insertions, 0 deletions