tree 29932718192962671c48c3fd1ea017a6112459e8
parent 788c0a53164c05c5ccdb1472474372b72ba74644
parent 2e761e0532a784816e7e822dbaaece8c5d4be14d
author David S. Miller <davem@davemloft.net> 1213089746 -0700
committer David S. Miller <davem@davemloft.net> 1213089746 -0700

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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h