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)
commit501706565b2d4d2d40d0d301d5411ede099b8a6f
tree142a18bf1f1e74a09dbfa27540b893ade0fd797d
parente93737b0f0159a61772894943199fd3b6f315641
parent2fe77b81c77eed92c4c0439f74c8148a295b4a86
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