lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases 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
parent 8d26784cf0 b4487c2d0e
commit e11c259f74
205 changed files with 9029 additions and 6464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/include/asm/socket.h
View File

@@ -71,4 +71,7 @@
#define SO_RXQ_OVFL 40
#define SO_WIFI_STATUS 41
#define SCM_WIFI_STATUS SO_WIFI_STATUS
#endif /* _ASM_IA64_SOCKET_H */