tree 0f726bbda9b18d311d4c95198bbd96cb7ac01db0
parent 26c0f03f6b77c513cb7bc37b73a06819bdbb791b
parent 2f633928cbba8a5858bb39b11e7219a41b0fbef5
author David S. Miller <davem@davemloft.net> 1205825875 -0700
committer David S. Miller <davem@davemloft.net> 1205825875 -0700

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

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c