tree 3e0a58e25b776cfbee193195460324dccb1886c7
parent 61c9eaf90081cbe6dc4f389e0056bff76eca19ec
parent 4bab0ea1d42dd1927af9df6fbf0003fc00617c50
author David S. Miller <davem@davemloft.net> 1226040183 -0800
committer David S. Miller <davem@davemloft.net> 1226040183 -0800

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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c