Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[powerpc.git] / lib / errno.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2