tree 22ef88d84a2e06380bb6a853c3ba28657e4e5f92
parent 814c01dc7c533033b4e99981a2e24a6195bfb43c
parent 52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430
author David S. Miller <davem@davemloft.net> 1235972116 -0800
committer David S. Miller <davem@davemloft.net> 1235972116 -0800

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
	net/8021q/vlan_core.c
	net/core/dev.c