summaryrefslogtreecommitdiff
path: root/src/bios_dev_name.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-03-03 09:54:51 -0800
committerStephen Hemminger <shemminger@vyatta.com>2012-03-03 09:54:51 -0800
commit8a220d37283b8623b57c3f100ca7a2965d8c6ce4 (patch)
tree9184876930875695cb45afadf0d1d2d16a7a1676 /src/bios_dev_name.c
parentd57a54c68677a516d4d4431d31b23361ad0c7c61 (diff)
parentb96cdd1ae44ab32072ea0613fc351050fe12ee91 (diff)
downloadvyatta-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