Merge remote-tracking branch 'mcb30/empty-tftp-ip'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 29 Mar 2011 21:45:22 +0000 (14:45 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 29 Mar 2011 21:45:22 +0000 (14:45 -0700)
commit0620743d1e54cf48aa8e5cf5636739addae49d60
tree43e9b7acd85bc22a5cfa1051fef680989f010e4c
parentbf5077ab7b0979c4418e6522835c6b054debd3a7
parent9126eb27d1d9597eb8751a5ef75c9bdcf4e429a6
Merge remote-tracking branch 'mcb30/empty-tftp-ip'