Mirko Vogt 4ecc663fa9 Merge branch 'master' of openwrt-backfire into xburst ...

Conflicts:

	target/linux/x86/image/Config.in

2010-06-08 11:24:58 +02:00

..

Config.in

Merge branch 'master' of openwrt-backfire into xburst

2010-06-08 11:24:58 +02:00

gen_image_olpc.sh

[backfire] merge r21243

2010-05-03 00:17:57 +00:00

gen_image_x86.sh

[backfire] merge r21243

2010-05-03 00:17:57 +00:00

Makefile

[backfire] merge [21362:21365] & [21369]

2010-05-16 13:45:38 +00:00

menu.lst

[x86]

2010-02-17 00:59:41 +00:00

olpc.fth

[x86] merge the olpc target with the x86 target, both tested and running

2009-11-03 01:02:39 +00:00