Hauke Mehrtens 28b4c3bf1c wireless: Fix merge. ...

in your merge in 5c01d56693 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>

2010-04-28 14:23:15 -07:00

..

ath

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

b43

…

b43legacy

…

hostap

…

ipw2x00

…

iwlwifi

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

iwmc3200wifi

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

libertas

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

libertas_tf

…

orinoco

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

p54

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

prism54

…

rt2x00

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

rtl818x

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

wl12xx

wireless: Fix merge.

2010-04-28 14:23:15 -07:00

zd1211rw

…

adm8211.c

…

adm8211.h

…

airo_cs.c

…

airo.c

…

airo.h

…

at76c50x-usb.c

…

at76c50x-usb.h

…

atmel_cs.c

…

atmel_pci.c

…

atmel.c

…

atmel.h

…

Kconfig

…

mac80211_hwsim.c

Merge branch 'master' into for-davem

2010-04-23 14:43:45 -04:00

Makefile

…

mwl8k.c

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

…

wl3501_cs.c

…

wl3501.h

…

zd1201.c

…

zd1201.h

…