diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-09-02 09:26:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-09-02 09:26:30 +0200 |
| commit | 6b1c8e0f50f73552c9db2a7e04960deef5cd0e6a (patch) | |
| tree | 66f7d1deb96a87a424890b9bac7502e48d2a39d0 /arch | |
| parent | b1e93dc9ae57cf009b093eab1a935efb2bb45527 (diff) | |
| parent | 53c4ef6b693e7a3ecd09a16c6d96aaf512bf6738 (diff) | |
| download | barebox-6b1c8e0f50f73552c9db2a7e04960deef5cd0e6a.tar.gz barebox-6b1c8e0f50f73552c9db2a7e04960deef5cd0e6a.tar.xz | |
Merge branch 'for-sha' of ssh://sha@octopus/home/git/projects/u-boot-v2 into from-mkl
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/pm9263_defconfig (renamed from arch/arm/configs/pn9263_defconfig) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/configs/pn9263_defconfig b/arch/arm/configs/pm9263_defconfig index 682eacba78..682eacba78 100644 --- a/arch/arm/configs/pn9263_defconfig +++ b/arch/arm/configs/pm9263_defconfig |