Merge remote-tracking branch 'origin/elflink' into firmware
commit27b0cc6c0788a8cba49637eac9ecd43d8d0370c7
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 11 Dec 2013 23:16:27 +0000 (11 15:16 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 11 Dec 2013 23:16:27 +0000 (11 15:16 -0800)
tree0ea23588918d8812cd26944ccefb02937486372f
parent5e59ac11d6d105591d6da742750ea2f804534d43
parentdbe7f9fdb797047522d588cffcbe5681e12b5807
Merge remote-tracking branch 'origin/elflink' into firmware

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
core/fs/pxe/tftp.c