]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Dec 2009 01:12:17 +0000 (17:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Dec 2009 01:12:17 +0000 (17:12 -0800)
commit9560f716f8130b2fc7e7821d0cb973d542412726
tree142a18bf1f1e74a09dbfa27540b893ade0fd797d
parente34b64852f9462c505acf17a4b8e7f4557b313f2
parentb6f77a3a3994199fb87a9d2b6ebebd98e4c980d8
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
include/net/tcp.h
MAINTAINERS
drivers/net/atl1c/atl1c_main.c
drivers/net/sky2.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/orinoco/hermes_dld.c
include/net/tcp.h