From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Jun 2008 08:54:31 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles... 
X-Git-Tag: v2.6.27-rc1~969^2~337
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788c0a53164c05c5ccdb1472474372b72ba74644;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/linville/wireless-next-2.6

Conflicts:

	drivers/net/ps3_gelic_wireless.c
	drivers/net/wireless/libertas/main.c
---

788c0a53164c05c5ccdb1472474372b72ba74644
Reading git-diff-tree failed