From: David S. Miller <davem@davemloft.net>
Date: Sat, 30 Aug 2008 06:06:00 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~717^2~383
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b171e19ed08c8ba832e5325fadf1be493f56665d;p=pandora-kernel.git

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

Conflicts:

	net/mac80211/mlme.c
---

b171e19ed08c8ba832e5325fadf1be493f56665d
Reading git-diff-tree failed