Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:51:58 +0000 (16:51 -0800)
1  2 
drivers/net/e1000/e1000_main.c
drivers/net/usb/hso.c

Simple merge
Simple merge