Merge branch 'cleanups' into softdep-merge
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Tue, 2 Mar 2010 09:59:00 +0000 (09:59 +0000)
committerAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Tue, 2 Mar 2010 09:59:27 +0000 (09:59 +0000)
commit7bfbf4ba583f5da45795856accc9cf1c7bd5623f
tree56ac40758a8685bb9c4b20b2d84ea1361525f160
parent66876e3ee43d52f1b41c56e5bab542b7c205b91b
parent8c7c5c102426cafcb2d118e307f246df66d650de
Merge branch 'cleanups' into softdep-merge

Conflicts:
modprobe.c
depmod.c
elfops.h
modprobe.c