Merge branch 'PATH-based-search' into for-hpa/elflink/ldlinux
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:12:17 +0000 (20:12 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:12:17 +0000 (20:12 +0100)
commit2e97bb931cc676846e1a8d373b6c8645d560a982
tree9f9d17832b06cb6eef5eaedb491ab8deaf571a7d
parent9ab2c9cd558e3047cdba3b4db31b69d26c493006
parentef3cb76bffc52b40b9a013f5b16835e062a5db4b
Merge branch 'PATH-based-search' into for-hpa/elflink/ldlinux

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