]> git.baikalelectronics.ru Git - kernel.git/commit
nl80211: Fix comment merge error
authorMichael Buesch <mb@bu3sch.de>
Tue, 10 Jun 2008 12:04:14 +0000 (14:04 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Sat, 14 Jun 2008 16:18:01 +0000 (12:18 -0400)
commit859c7fad8c87448f0689ca3f0679e2c6bfa4d652
treece76db33c510abc9dfb261d4929805b80462bf41
parent097ebf3bf793a31378a9edfd02b92eababdd6101
nl80211: Fix comment merge error

The comments ended up in the wrong place due to a merge error.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
include/linux/nl80211.h