]> git.ipfire.org Git - thirdparty/systemd.git/commit
bleah, more merge fixes...
authorGreg KH <greg@press.(none)>
Wed, 27 Apr 2005 06:15:56 +0000 (23:15 -0700)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 06:15:56 +0000 (23:15 -0700)
commit18ebc4305034401648e343b27981ef1badafef1c
tree8c8c9131660ab707ca32fa7acfd2ec048495e8d9
parent0d9057a1cebf2058c36879278b7ba03a5c8ed81f
bleah, more merge fixes...
test/udev-test.pl
udev.c
udevinfo.c