tree 6f09861b5e2f875d2d8ea2127b16add9103221c6
parent 5a6338db37885af06760d40cad589316e48431e9
parent ffafa60d496f80c250f2ae0340ae94434c0b0b4d
author David S. Miller <davem@davemloft.net> 1248401031 -0700
committer David S. Miller <davem@davemloft.net> 1248401031 -0700

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

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c