Merge branch 'for-hpa/elflink/core' into elflink
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:51:32 +0000 (09:51 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:51:32 +0000 (09:51 +0100)
1  2 
core/diskfs.inc

diff --cc core/diskfs.inc
Simple merge