Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
authorMatt Fleming <matt.fleming@intel.com>
Mon, 13 Aug 2012 15:45:11 +0000 (16:45 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Mon, 13 Aug 2012 15:45:37 +0000 (16:45 +0100)
commitfe084791a5e8c0985717d990d26652f416d12f15
treecae01d8061e6f8ef224ed98beb021e20d3e9b6c1
parentb6b97c945d171aebc30510249a77581cd57fc8e7
parentd1d03dee6bc961b0afd8dfc68fd35772ecded8be
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware

Conflicts:
com32/lib/sys/module/common.c
com32/include/sys/module.h
com32/lib/sys/module/common.c
core/elflink/load_env32.c
mk/elf.mk