From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 Jul 2008 23:30:17 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~185
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c3ceb4a409e2b838700edf081d61a8a4c921e79;p=pandora-kernel.git

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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c
---

7c3ceb4a409e2b838700edf081d61a8a4c921e79
Reading git-diff-tree failed