diff options
| author | Tom Gundersen <teg@jklm.no> | 2011-03-30 17:27:24 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-03-30 17:27:24 +0200 |
| commit | 9ddc3214babae7110ca80dad12d6b0d74d75defd (patch) | |
| tree | 5f0614be21d3ab445a46716aa53550b61fc7b646 /minilogd.c | |
| parent | 32272781b1d49496bcc5b6ce4394192e0f7306a3 (diff) | |
| parent | 5bf3735ba6b03c3ec754e713174a5964f8a0151a (diff) | |
Merge branch 'hwclock-from-kurt' into arch-master
Conflicts:
rc.shutdown
rc.sysinit
Diffstat (limited to 'minilogd.c')
0 files changed, 0 insertions, 0 deletions