Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc drivers/ieee1394/eth1394.c
Simple merge

diff --cc drivers/ieee1394/eth1394.h
Simple merge

diff --cc drivers/misc/sgi-xp/xpnet.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc firmware/Makefile
Simple merge