Merge branch 'master' of...
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: include/net/bluetooth/bluetooth.h
No related branches found
No related tags found
Showing
- arch/alpha/include/asm/socket.h 3 additions, 0 deletionsarch/alpha/include/asm/socket.h
- arch/arm/include/asm/socket.h 3 additions, 0 deletionsarch/arm/include/asm/socket.h
- arch/avr32/include/asm/socket.h 3 additions, 0 deletionsarch/avr32/include/asm/socket.h
- arch/cris/include/asm/socket.h 3 additions, 0 deletionsarch/cris/include/asm/socket.h
- arch/frv/include/asm/socket.h 3 additions, 0 deletionsarch/frv/include/asm/socket.h
- arch/h8300/include/asm/socket.h 3 additions, 0 deletionsarch/h8300/include/asm/socket.h
- arch/ia64/include/asm/socket.h 3 additions, 0 deletionsarch/ia64/include/asm/socket.h
- arch/m32r/include/asm/socket.h 3 additions, 0 deletionsarch/m32r/include/asm/socket.h
- arch/m68k/include/asm/socket.h 3 additions, 0 deletionsarch/m68k/include/asm/socket.h
- arch/mips/include/asm/socket.h 3 additions, 0 deletionsarch/mips/include/asm/socket.h
- arch/mn10300/include/asm/socket.h 3 additions, 0 deletionsarch/mn10300/include/asm/socket.h
- arch/parisc/include/asm/socket.h 3 additions, 0 deletionsarch/parisc/include/asm/socket.h
- arch/powerpc/include/asm/socket.h 3 additions, 0 deletionsarch/powerpc/include/asm/socket.h
- arch/s390/include/asm/socket.h 3 additions, 0 deletionsarch/s390/include/asm/socket.h
- arch/sparc/include/asm/socket.h 3 additions, 0 deletionsarch/sparc/include/asm/socket.h
- arch/xtensa/include/asm/socket.h 3 additions, 0 deletionsarch/xtensa/include/asm/socket.h
- drivers/bluetooth/ath3k.c 11 additions, 4 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/bfusb.c 1 addition, 3 deletionsdrivers/bluetooth/bfusb.c
- drivers/bluetooth/bluecard_cs.c 1 addition, 3 deletionsdrivers/bluetooth/bluecard_cs.c
- drivers/bluetooth/bt3c_cs.c 1 addition, 3 deletionsdrivers/bluetooth/bt3c_cs.c
Loading
Please register or sign in to comment