From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Sep 2008 23:59:05 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~717^2~306
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

	net/mac80211/mlme.c
---

17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b
Reading git-diff-tree failed