diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:04:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:04:04 +0200 |
| commit | 7ccfe4d3a013db098c065b345dc0de3ed79934ce (patch) | |
| tree | 9fe8cb2e62999199e1d9f1bc25d8fe89240c5bf4 /arch/openrisc | |
| parent | 73339649ae5c74c7c4dd981cc406500cddf1f4b8 (diff) | |
| parent | c4832fcd162c1a35f690d58ad08b189f6633c93f (diff) | |
| download | barebox-7ccfe4d3a013db098c065b345dc0de3ed79934ce.tar.gz barebox-7ccfe4d3a013db098c065b345dc0de3ed79934ce.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/configs/am335x_beaglebone_defconfig
arch/arm/configs/am335x_defconfig
Diffstat (limited to 'arch/openrisc')
0 files changed, 0 insertions, 0 deletions