tree 22d29905c148d2d743b3eccb585fbe60fb91e25a
parent 851fd7bd88524bb4e20f3def3127cd9167d6d0cf
parent 3ec192559033ed457f0d7856838654c100fc659f
author David S. Miller <davem@davemloft.net> 1227772120 -0800
committer David S. Miller <davem@davemloft.net> 1227772120 -0800

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

Conflicts:

	drivers/net/hp-plus.c
	drivers/net/wireless/ath5k/base.c
	drivers/net/wireless/ath9k/recv.c
	net/wireless/reg.c