Merge zizzer:/bk/linux

into zower.eecs.umich.edu:/z/alschult/DiskModel/linux

--HG--
extra : convert_revision : b23a1d1a79ac5c593150d269d0523c474cf6a4a0

diff --cc dev/ide_ctrl.cc
Simple merge

diff --cc dev/ns_gige.cc
Simple merge

diff --cc dev/ns_gige.hh
Simple merge

diff --cc dev/pciconfigall.cc
Simple merge

diff --cc dev/pcidev.cc
Simple merge