]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
commitef6387eb9abf46e536b36d7a3d207e649251d3a7
tree6ac985658a06b0787e4354d0d16d380ea9b16a5a
parent0c208b02b3949f21b05593625e8ef60b78a75536
parent036031e6cb98560dcf726c26f1bd528a9c9eef75
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/3c505.c
drivers/net/bnx2.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/phy/mdio-gpio.c
drivers/net/qlge/qlge_main.c
drivers/net/tg3.c
fs/compat_ioctl.c
include/net/sock.h
net/core/sock.c
net/mac80211/tx.c