diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 14:20:42 +0200 |
| commit | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (patch) | |
| tree | 9e829ce3e8a29e76b6e8f1459b2636768d170a71 /include | |
| parent | 2143dfda8b32b8d1cda16982efeca57ca97b3996 (diff) | |
| parent | a81ec0225f5a100341c20b4329c8b1d81ab025c4 (diff) | |
| download | barebox-dd9f6d08a2736bf8ddc0004779c563a4c3a77cef.tar.gz barebox-dd9f6d08a2736bf8ddc0004779c563a4c3a77cef.tar.xz | |
Merge branch 'for-next/relocate'
Conflicts:
arch/arm/lib/barebox.lds.S
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions