Merge branch 'master' into wireless
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Tue, 9 Jun 2009 05:12:25 +0000 (22:12 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Tue, 9 Jun 2009 05:12:25 +0000 (22:12 -0700)
commite132ed853436ffc5d70f0a103b1a62067d812d23
tree44f8059795fd14fe4e630515d81db33ae2596b77
parent8182fff820119754b78c3ec8ed6f4de7884777e1
parent4f3e0a29b5410468979ec34be5a89df716f8285e
Merge branch 'master' into wireless

Conflicts:

src/include/gpxe/netdevice.h
            Updated for MAX_LL_HEADER_LEN == 32 for 802.11,
            with explanatory comment.
src/include/gpxe/netdevice.h