Merge remote-tracking branch 'origin/bug-405495'
authorRobin H. Johnson <robbat2@gentoo.org>
Sat, 10 Mar 2012 21:23:28 +0000 (13:23 -0800)
committerRobin H. Johnson <robbat2@gentoo.org>
Sat, 10 Mar 2012 21:23:28 +0000 (13:23 -0800)
commit4a3e1ff1cfae09860b87b04fa9f315326910a465
tree97d29ca268f4430b8101644baa890226b0d7f0f1
parent995635a2c7fbc6cc6250f697c4977bd2e2f56762
parent1159b4c2f6c7cb672941e4786b4d1b427c25748a
Merge remote-tracking branch 'origin/bug-405495'

Conflicts:
ChangeLog
arch/x86_64/modules_load
ChangeLog
arch/x86/modules_load
arch/x86_64/modules_load
defaults/modules_load