diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:14 +0200 |
commit | ebf9022f2eee564fc4b0e4b37a8267319923d808 (patch) | |
tree | 407715e96a34f57b194198c24099cd7b627ae714 /arch/arm/boards/versatile/lowlevel.c | |
parent | a293dc2753433f8052f9471b2d0cc19f01c50739 (diff) | |
parent | 7359e2852249758f6fb12dae9a0d57a197b7a769 (diff) | |
download | barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.gz barebox-ebf9022f2eee564fc4b0e4b37a8267319923d808.tar.xz |
Merge branch 'for-next/rs485'
Conflicts:
common/console_common.c
Diffstat (limited to 'arch/arm/boards/versatile/lowlevel.c')
0 files changed, 0 insertions, 0 deletions