git.stricted.de - GitHub/mt8127/android_kernel_alcatel

author	David S. Miller <davem@davemloft.net>
	Mon, 8 Sep 2008 23:59:05 +0000 (16:59 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 8 Sep 2008 23:59:05 +0000 (16:59 -0700)
commit	17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b
tree	88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446	tree \| snapshot (tar.gz zip)
parent	712d6954e3998d0de2840d8130941e8042541246	commit \| diff
parent	82a28c794f27aac17d7a3ebd7f14d731a11a5532	commit \| diff

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

net/mac80211/mlme.c

20 files changed:

drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00reg.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history

kernel source for telekom puls (alcatel/mediatek)

drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00reg.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history