Merge branch 'master' into usb
authorBalaji Rao <balajirrao@gmail.com>
Fri, 11 Jul 2008 01:54:56 +0000 (07:24 +0530)
committerroot <root@localhost.localdomain>
Fri, 11 Jul 2008 01:54:56 +0000 (07:24 +0530)
commitc01f70d6cbc48887a799508f372cce90e9e8926e
tree23dfa796708b4d0597003dafb54d893f4de1100d
parentbc7dfeaf9acfe3f160e0d10631eceb1816eff092
parent21e9e801e268302cf2705d9b0e658f9896963fe0
Merge branch 'master' into usb

Conflicts:

src/include/gpxe/errfile.h
src/Makefile
src/include/gpxe/errfile.h