Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

author David S. Miller <davem@davemloft.net>

Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)

committer David S. Miller <davem@davemloft.net>

Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
author David S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
committer David S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
diff --cc drivers/net/e1000/e1000_main.c
Simple merge
diff --cc drivers/net/usb/hso.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
		1	2
drivers/net/e1000/e1000_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	patch \|	diff1 \|	diff2 \|	blob \| history