Merge branch 'fs-config' into for-hpa/elflink/ldlinux
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:10:59 +0000 (20:10 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:10:59 +0000 (20:10 +0100)
commit9ab2c9cd558e3047cdba3b4db31b69d26c493006
treebbbd0c8733e39a41395366cc0cfc7148f29fc52f
parentd89bda4a721e7e0299fe4fc88ee6e45be989819c
parente298faf1adc98fdb5f69debe15569a734d5adfa1
Merge branch 'fs-config' into for-hpa/elflink/ldlinux

Conflicts:
com32/elflink/ldlinux/readconfig.c
com32/elflink/ldlinux/readconfig.c