From: David S. Miller <davem@davemloft.net>
Date: Fri, 24 Jul 2009 02:03:51 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.32-rc1~703^2~559
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d154189d597b91da4322996dbf4f5c3d1544ab;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

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

74d154189d597b91da4322996dbf4f5c3d1544ab
Reading git-diff-tree failed