c1aca1d692b408955aea20c9cd9a37e589c0
parent 99dd1a2b8347ac2ae802300b7862f6f7bcf17139
parent 066b2118976e6e7cc50eed39e2747c75343a23c4
author David S. Miller <davem@davemloft.net> 1210836884 -0700
committer David S. Miller <davem@davemloft.net> 1210836884 -0700

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c
�)���