review.tizen.org Git - platform/kernel/linux-stable.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 8 Jul 2008 23:30:17 +0000 (16:30 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 8 Jul 2008 23:30:17 +0000 (16:30 -0700)
commit	7c3ceb4a409e2b838700edf081d61a8a4c921e79
tree	4dbf54cc23d2796b278e22fc6f5460b9b451c956	tree \| snapshot
parent	54dceb008ffcbe003bea9017cad1227a83b6fc3f	commit \| diff
parent	b2238566401f01eb796e75750213c7b0fce396b2	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/iwlwifi/iwl-3945.c
net/mac80211/mlme.c

Domain: System / Kernel;

drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_usb.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history