diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:35 +0100 |
| commit | 55ab01c7ff16e5fcb2d91870d0ab84399512ee3f (patch) | |
| tree | 62effecfbc202bf8954de3bbfab50ecb9c7992db /images | |
| parent | 5c8ced1a6dec754a757d730a0205d168728c7f96 (diff) | |
| parent | 84fcb04367ccf9c89f442c8a5a716cceb34413e6 (diff) | |
| download | barebox-55ab01c7ff16e5fcb2d91870d0ab84399512ee3f.tar.gz barebox-55ab01c7ff16e5fcb2d91870d0ab84399512ee3f.tar.xz | |
Merge branch 'for-next/rockchip'
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'images')
0 files changed, 0 insertions, 0 deletions