From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 15 Apr 2008 18:09:27 +0000 (-0400)
Subject: mlme.c: fixup some merge damage
X-Git-Tag: v2.6.26-rc1~1138^2~9^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50c4afb99166dc0d2e8a0b063fe83befaa426a44;p=pandora-kernel.git

mlme.c: fixup some merge damage

This one got renamed, complicating the merge a bit...this should restore
it to its intended state.

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

Reading git-diff-tree failed