Merge by hand (conflicts in sr.c)
[cascardo/linux.git] / scripts / mod / modpost.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2