diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-03 09:54:51 -0800 |
---|---|---|
committer | Stephen Hemminger <shemminger@vyatta.com> | 2012-03-03 09:54:51 -0800 |
commit | 8a220d37283b8623b57c3f100ca7a2965d8c6ce4 (patch) | |
tree | 9184876930875695cb45afadf0d1d2d16a7a1676 /src/bios_dev_name.c | |
parent | d57a54c68677a516d4d4431d31b23361ad0c7c61 (diff) | |
parent | b96cdd1ae44ab32072ea0613fc351050fe12ee91 (diff) | |
download | vyatta-biosdevname-8a220d37283b8623b57c3f100ca7a2965d8c6ce4.tar.gz vyatta-biosdevname-8a220d37283b8623b57c3f100ca7a2965d8c6ce4.zip |
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-biosdevname into oxnardoxnard
Conflicts:
debian/changelog
Diffstat (limited to 'src/bios_dev_name.c')
0 files changed, 0 insertions, 0 deletions