Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

[linux-2.6] / lib / errno.c

/*
 *  linux/lib/errno.c
 *
 *  Copyright (C) 1991, 1992  Linus Torvalds
 */

int errno;