1. 12 Apr, 2015 29 commits
  2. 11 Apr, 2015 3 commits
  3. 09 Apr, 2015 5 commits
  4. 07 Apr, 2015 2 commits
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 7abccdba
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-04-04
      
      Here's what's probably the last bluetooth-next pull request for 4.1:
      
       - Fixes for LE advertising data & advertising parameters
       - Fix for race condition with HCI_RESET flag
       - New BNEPGETSUPPFEAT ioctl, needed for certification
       - New HCI request callback type to get the resulting skb
       - Cleanups to use BIT() macro wherever possible
       - Consolidate Broadcom device entries in the btusb HCI driver
       - Check for valid flags in CMTP, HIDP & BNEP
       - Disallow local privacy & OOB data combo to prevent a potential race
       - Expose SMP & ECDH selftest results through debugfs
       - Expose current Device ID info through debugfs
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7abccdba
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c85d6975
      David S. Miller authored
      Conflicts:
      	drivers/net/ethernet/mellanox/mlx4/cmd.c
      	net/core/fib_rules.c
      	net/ipv4/fib_frontend.c
      
      The fib_rules.c and fib_frontend.c conflicts were locking adjustments
      in 'net' overlapping addition and removal of code in 'net-next'.
      
      The mlx4 conflict was a bug fix in 'net' happening in the same
      place a constant was being replaced with a more suitable macro.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c85d6975
  5. 06 Apr, 2015 1 commit