chiark / gitweb /
Merge commit '5f03ed8a56d308af72db8a48ab66ed68667af2c6'
authorKay Sievers <kay.sievers@vrfy.org>
Wed, 21 Jan 2009 13:42:30 +0000 (14:42 +0100)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 21 Jan 2009 13:42:30 +0000 (14:42 +0100)
commit2c7b88c4a55426087955a12aad33c1935e639876
treee9d5843ee200d1e092e1a33929da2171dc63d4f7
parentc807ad918c7c61a8af3fcc930cc2a5ad4c978ea1
parent5f03ed8a56d308af72db8a48ab66ed68667af2c6
Merge commit '5f03ed8a56d308af72db8a48ab66ed68667af2c6'

Conflicts:
udev/udevd.c
udev/udevd.c