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)
commit005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5
treebc3ef1b64dcdb48b2d6accb51951a0d73b33262e
parent4d7902f22b0804730b80f7a4147f676430248a3a
parenteda58a85ec3fc05855a26654d97a2b53f0e715b9
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
drivers/net/e1000/e1000_main.c
drivers/net/usb/hso.c