From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 16 Dec 2010 20:21:33 +0000 (-0500)
Subject: Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca... 
X-Git-Tag: Ubuntu-5.0.0-8.9~20751^2~104^2~4^2~35
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5928b91acae97622a6f2e679eb7a9f19bed68e3e;p=mirror_ubuntu-disco-kernel.git

Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
---

5928b91acae97622a6f2e679eb7a9f19bed68e3e