From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Jun 2008 19:17:58 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6
X-Git-Tag: v2.6.27-rc1~969^2~254^2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1839cea91e5629756dd4f87c5d70d8a18b89c0b4;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6
---

1839cea91e5629756dd4f87c5d70d8a18b89c0b4