]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dd9e0dd) | patch
mlme.c: fixup some merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 15 Apr 2008 18:09:27 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 16 Apr 2008 15:42:59 +0000 (11:42 -0400)
commit50c4afb99166dc0d2e8a0b063fe83befaa426a44
tree8aa6e7ba463bfd286e683b8b5ea0980d46c9953atree | snapshot
parentdd9e0dda66ba38a2ddd1405ac279894260dc5c36commit | diff
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>
net/mac80211/mlme.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.