Merge branch 'alan-softdep-merge' into dev
authorJon Masters <jcm@jonmasters.org>
Wed, 10 Mar 2010 06:04:57 +0000 (01:04 -0500)
committerJon Masters <jcm@jonmasters.org>
Wed, 10 Mar 2010 06:04:57 +0000 (01:04 -0500)
commit74efce3e06313f2a57171f75c514b2eef2a9e755
treed478585ff211eda2fa2402488f12ee81bed1795f
parentd99d7ddee568f7f10ad71d4f1d66ff6530d47646
parent70ce1505e1d9b73060828552b695d0d4a4b57515
Merge branch 'alan-softdep-merge' into dev
depmod.c
doc/modprobe.conf.sgml
modprobe.c