Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller [Thu, 8 Jan 2009 19:05:59 +0000 (11:05 -0800)]
1  2 
drivers/ieee1394/eth1394.c
drivers/ieee1394/eth1394.h
drivers/misc/sgi-xp/xpnet.c
drivers/net/Kconfig
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
firmware/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge