tree c0e2324c09beca0eb5782eb5abf241ea2b7a4a11
parent 275f165fa970174f8a98205529750e8abb6c0a33
parent a432226614c5616e3cfd211e0acffa0acfb4770c
author David S. Miller <davem@davemloft.net> 1225437454 -0700
committer David S. Miller <davem@davemloft.net> 1225437454 -0700

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

Conflicts:

	drivers/net/wireless/p54/p54common.c