]> pilppa.com Git - linux-2.6-omap-h63xx.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, 8 Jul 2008 23:30:17 +0000 (16:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2008 23:30:17 +0000 (16:30 -0700)
commit7c3ceb4a409e2b838700edf081d61a8a4c921e79
tree4dbf54cc23d2796b278e22fc6f5460b9b451c956
parent54dceb008ffcbe003bea9017cad1227a83b6fc3f
parentb2238566401f01eb796e75750213c7b0fce396b2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/iwlwifi/iwl-3945.c
net/mac80211/mlme.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/zd1211rw/zd_usb.c
net/ipv6/addrconf.c
net/mac80211/main.c
net/mac80211/mlme.c
net/sctp/sm_statefuns.c