Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 30 Aug 2008 06:06:00 +0000 (23:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Aug 2008 06:06:00 +0000 (23:06 -0700)
commitb171e19ed08c8ba832e5325fadf1be493f56665d
tree017208f9fcc4ef2cc3fe5cc3f262d2455eda9f61
parent143b11c03cd42f2284efe5128afc057d8fc86c78
parent7c19a3d280297d43ef5ff7c6b205dc208a16d3d1
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

net/mac80211/mlme.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath5k/base.h
net/ipv4/route.c
net/mac80211/ieee80211_i.h
net/mac80211/mesh.c
net/mac80211/mlme.c