tree 176edb26aad2d33e8be36530b66b19d0603c4b1d
parent 03194379a77b02df3404ec4848a50c6784e9a8a5
parent 289c79a4bd350e8a25065102563ad1a183d1b402
author David S. Miller <davem@davemloft.net> 1211783170 -0700
committer David S. Miller <davem@davemloft.net> 1211783170 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c