Merge commit 'v2.6.31-rc7' into x86/cpu
[sfrench/cifs-2.6.git] / drivers / staging / rt2870 / sta_ioctl.c
1 #include "../rt2860/sta_ioctl.c"