refs/tags/master-2012-05-08-2 - pub/scm/linux/kernel/git/luca/mac80211-next-csa

commit: 341352d13dae752610342923c53ebe461624ee2c
[log]
author: John W. Linville <linville@tuxdriver.com>
Tue May 08 22:18:09 2012 -0400
committer: John W. Linville <linville@tuxdriver.com>
Tue May 08 22:18:09 2012 -0400
tree: 05797e3686984b0e1b963882e886e95817c1d4dc
parent: 70c33eaae79e53f9e48324736c0cb85534d3f093 [diff]

iwlwifi: fix-up some merge damage from commit 0d6c4a2

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 file changed

tree: 05797e3686984b0e1b963882e886e95817c1d4dc