Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
authorPeter Korsgaard <jacmet@sunsite.dk>
Tue, 22 Jun 2010 21:43:08 +0000 (23:43 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 22 Jun 2010 21:43:08 +0000 (23:43 +0200)
commitf3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a
tree2b1e7628b5bad58c4b4065b9de30321bd02ff502
parentb10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d
parent7b7b4260966a5d991b1dabc82c792fbecd77c63a
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot

Conflicts:
target/Makefile.in
Config.in
target/Makefile.in