mlme.c: fixup some merge damage
tree8aa6e7ba463bfd286e683b8b5ea0980d46c9953a
-rw-r--r-- 644 .gitignore
-rw-r--r-- 3657 .mailmap
-rw-r--r-- 18693 COPYING
-rw-r--r-- 92549 CREDITS
drwxr-xr-x - Documentation
-rw-r--r-- 1596 Kbuild
-rw-r--r-- 96825 MAINTAINERS
-rw-r--r-- 54115 Makefile
-rw-r--r-- 16930 README
-rw-r--r-- 3172 REPORTING-BUGS
drwxr-xr-x - arch
drwxr-xr-x - block
drwxr-xr-x - crypto
drwxr-xr-x - drivers
drwxr-xr-x - fs
drwxr-xr-x - include
drwxr-xr-x - init
drwxr-xr-x - ipc
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - mm
drwxr-xr-x - net
drwxr-xr-x - samples
drwxr-xr-x - scripts
drwxr-xr-x - security
drwxr-xr-x - sound
drwxr-xr-x - usr
drwxr-xr-x - virt