]> mj.ucw.cz Git - pciutils.git/commit
Merge branch 'domains'
authorMartin Mares <mj@ucw.cz>
Sat, 14 May 2016 09:48:32 +0000 (11:48 +0200)
committerMartin Mares <mj@ucw.cz>
Sat, 14 May 2016 09:48:32 +0000 (11:48 +0200)
commit8442ab4bc6a775a5fea8132c133e49f9b9bf71d5
tree44b7f82ad1634693e7e065ec08e10bd0b7dcf60f
parent42502a496786c94c6f8c246eab08f3f0c8f7db49
parentab61451d47514c473953a24aa4f4f816b77ade56
Merge branch 'domains'

Conflicts:
lib/pci.h
lib/filter.c
lib/internal.h
lib/pci.h
lib/sysfs.c