A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Browse source 
Conflicts:
	include/net/bluetooth/bluetooth.h
This commit is contained in:
John W. Linville 2011-11-17 13:11:43 -05:00
commit e11c259f74
205 changed files with 9141 additions and 6576 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/parisc/include/asm/socket.h
View file

@ -61,6 +61,9 @@
#define SO_RXQ_OVFL 0x4021
#define SO_WIFI_STATUS 0x4022
#define SCM_WIFI_STATUS SO_WIFI_STATUS
/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
* have to define SOCK_NONBLOCK to a different value here.
*/