diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 16:31:29 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 16:31:29 -0500 |
| commit | d6b9d4d92ed92200e07831f251f1a1048518783d (patch) | |
| tree | 0453cebd5474abfab2e69bd3f54a03dd6a01af5f /linaro/configs/null.conf | |
| parent | 234cf04ce5a07001e52de054e3dbcf0b5533f587 (diff) | |
| parent | 20e35c93269ea7b2536be7743da266c18c6974fa (diff) | |
Merge branch 'config-boards-4.0' into linux-linaro-lng-v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/arndale.conf
linaro/configs/highbank.conf
linaro/configs/omap4.conf
linaro/configs/vexpress.conf
linaro/configs/vexpress64.conf
Diffstat (limited to 'linaro/configs/null.conf')
| -rw-r--r-- | linaro/configs/null.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linaro/configs/null.conf b/linaro/configs/null.conf new file mode 100644 index 000000000000..1f71535af70b --- /dev/null +++ b/linaro/configs/null.conf @@ -0,0 +1 @@ +### null config just for testing multiple config frags |