From: Greg KH <greg@press.(none)>
Date: Wed, 27 Apr 2005 06:15:56 +0000 (-0700)
Subject: bleah, more merge fixes...
X-Git-Tag: 050~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=18ebc4305034401648e343b27981ef1badafef1c;hp=18ebc4305034401648e343b27981ef1badafef1c;p=elogind.git

bleah, more merge fixes...
---