diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
commit | f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch) | |
tree | 2b1e7628b5bad58c4b4065b9de30321bd02ff502 /Config.in | |
parent | b10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff) | |
parent | 7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff) | |
download | buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.gz buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.zip |
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts:
target/Makefile.in
Diffstat (limited to 'Config.in')
-rw-r--r-- | Config.in | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -288,4 +288,4 @@ source "fs/Config.in" source "boot/Config.in" -source "target/Config.in" +source "linux/Config.in" |