]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4f85f5b) | patch
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)
commit564d9bdd89df4ceece5d126ff3b7db506ae06548
treece76db33c510abc9dfb261d4929805b80462bf41tree | snapshot
parent4f85f5b39208e755a93f63296ec1224d14121b6ccommit | diff
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 diff | blob | history
Linux 2.6 source tree