From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Fri, 2 Sep 2005 07:48:33 +0000 (-0700)
Subject: Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.14-rc1~1017
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5d8c397f304e1363f8ff9749b08172eb59e6534a;p=linux-2.6-omap-h63xx.git

Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
---

5d8c397f304e1363f8ff9749b08172eb59e6534a