]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b7a3128) | patch
wireless: Fix merge.
authorHauke Mehrtens <hauke@hauke-m.de>
Wed, 28 Apr 2010 21:23:15 +0000 (14:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Apr 2010 21:23:15 +0000 (14:23 -0700)
commit8941de9b5669c4e9cc9f969c9f44a2954c47fb88
tree78b1a6af251f6e85911b59b3b98fa071dcd853ectree | snapshot
parentb7a3128b3826d7557018bb6ac56e6125346b7437commit | diff
wireless: Fix merge.

in your merge in 3d1925f7798f43a8655c748de3c394324228351f you added "int
i;" into wl1271_main.c which is unused in that function.

This patch fixes the merge problem:

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/wl12xx/wl1271_main.c diff | blob | history
Linux Kernel Source Tree.