Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / drivers / staging / rt2870 / sta / assoc.c
1 #include "../../rt2860/sta/assoc.c"