]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
projects / ~shefty / rdma-dev.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2c48520) | 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)
commit28b4c3bf1c4aa306fc5189fc7d556aa780c68e98
tree78b1a6af251f6e85911b59b3b98fa071dcd853ectree | snapshot
parent2c485209a5c73fe94f4074e381cdc1ee24ca94a8commit | diff
wireless: Fix merge.

in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad 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
RDMA kernel development