Merge by hand (conflicts in sr.c)
[sfrench/cifs-2.6.git] / Documentation / arm / IXP2000
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2