Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Jan 2009 19:05:59 +0000 (11:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jan 2009 19:05:59 +0000 (11:05 -0800)
commit7f46b1343f723f98634a5dcee47856b2000079ed
treeed22b6298c8dd2f687890a0d79abcd1d273b5f81
parentb8c31da64165b8566fc6e1c9c826f76e7b98ff02
parent9e42d0cf5020aaf217433cad1a224745241d212a
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6
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