]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2009 12:04:16 +0000 (05:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2009 12:04:16 +0000 (05:04 -0700)
commitb22068ce9e0416b307925c3b27c6a6528f2cd1f1
tree7135c9054db234feec6001c6d938a715b29e2370
parent86e58c99ef482664f013b46b837e4a1d476ff3d5
parente78676a5410099a4ee0fcfd1c3614f2453741eb7
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bnx2x_main.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/p54/p54common.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt73usb.c
net/wireless/reg.c