summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'iocb' into for-davemAl Viro2015-04-0969-266/+199
|\
| * fs: move struct kiocb to fs.hChristoph Hellwig2015-03-2563-86/+55
| * fs: split generic and aio kiocbChristoph Hellwig2015-03-137-77/+81
| * fs: don't allow to complete sync iocbs through aio_completeChristoph Hellwig2015-03-135-57/+12
| * fuse: handle synchronous iocbs internallyChristoph Hellwig2015-03-132-20/+32
| * fs: remove ki_nbytesChristoph Hellwig2015-03-1210-38/+28
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-04-0722-338/+570
|\ \
| * | Bluetooth: Fix location of TX power field in LE advertising dataMarcel Holtmann2015-04-041-6/+8
| * | Bluetooth: hidp: Use BIT(x) instead of (1 << x)Marcel Holtmann2015-04-041-2/+2
| * | Bluetooth: cmtp: Use BIT(x) instead of (1 << x)Marcel Holtmann2015-04-042-3/+3
| * | Bluetooth: bnep: Handle BNEP connection setup requestGrzegorz Kolodziejczyk2015-04-033-4/+15
| * | Bluetooth: bnep: Add support to extended headers of control framesGrzegorz Kolodziejczyk2015-04-031-10/+36
| * | Bluetooth: bnep: Add support for get bnep features via ioctlGrzegorz Kolodziejczyk2015-04-033-0/+10
| * | Bluetooth: bnep: Return err value while sending cmd is not understoodGrzegorz Kolodziejczyk2015-04-031-1/+1
| * | Bluetooth: Disallow LE local out-of-band data when LE privacy is usedMarcel Holtmann2015-04-021-6/+19
| * | Bluetooth: Convert local OOB data reading to use HCI requestJohan Hedberg2015-04-023-54/+65
| * | Bluetooth: Move hci_get_cmd_complete() to hci_event.cJohan Hedberg2015-04-022-51/+58
| * | Bluetooth: Remove unused hci_req_pending() functionJohan Hedberg2015-04-022-7/+0
| * | Bluetooth: Remove unneeded recv_event variableJohan Hedberg2015-04-023-16/+0
| * | Bluetooth: Convert hci_req_sync family of function to new request APIJohan Hedberg2015-04-022-14/+15
| * | Bluetooth: Add second hci_request callback option for full skbJohan Hedberg2015-04-025-44/+84
| * | Bluetooth: Add clarifying comment to command status handlingJohan Hedberg2015-04-021-0/+6
| * | Bluetooth: Export SMP selftest result in debugfsMarcel Holtmann2015-04-021-9/+34
| * | Bluetooth: Export ECDH selftest result in debugfsMarcel Holtmann2015-04-021-4/+31
| * | Bluetooth: Restrict BNEP flags to only valid onesMarcel Holtmann2015-04-021-1/+11
| * | Bluetooth: Restrict HIDP flags to only valid onesMarcel Holtmann2015-04-021-1/+10
| * | Bluetooth: Restrict CMTP flags to only valid onesMarcel Holtmann2015-04-021-1/+10
| * | Bluetooth: Remove unneeded extra ( ) in valid flags checkMarcel Holtmann2015-04-021-1/+1
| * | Bluetooth: Expose current Device ID information via debugfsMarcel Holtmann2015-04-021-0/+26
| * | Bluetooth: Refactor HCI request variables into own structJohan Hedberg2015-03-305-16/+22
| * | Bluetooth: Refactor L2CAP variables into l2cap_ctrlJohan Hedberg2015-03-304-32/+32
| * | Bluetooth: Remove superfluous extra empty line between functionsMarcel Holtmann2015-03-291-1/+0
| * | Bluetooth: Fix error returns for Read Local OOB Extended Data commandsMarcel Holtmann2015-03-291-37/+34
| * | Bluetooth: Move memory location outside of hci_dev lockMarcel Holtmann2015-03-291-8/+6
| * | Bluetooth: Update adv. parameters when conn. setting changesArman Uguray2015-03-281-1/+2
| * | Bluetooth: Use ADV_SCAN_IND for adv. instancesArman Uguray2015-03-281-1/+20
| * | Bluetooth: Fix using global connectable settings for advArman Uguray2015-03-281-4/+10
| * | Bluetooth: Fix race condition with HCI_RESET flagJohan Hedberg2015-03-281-10/+10
| * | Bluetooth: btusb: Consolidate Broadcom based device entriesMarcel Holtmann2015-03-281-8/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-0691-275/+575
|\ \ \
| * | | Linux 4.0-rc7v4.0-rc7Linus Torvalds2015-04-061-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-0621-71/+78
| |\ \ \
| | * | | net/mlx4_core: Fix error message deprecation for ConnectX-2 cardsJack Morgenstein2015-04-061-1/+2
| | * | | net: dsa: fix filling routing table from OF descriptionPavel Nakonechny2015-04-062-17/+10
| | * | | l2tp: unregister l2tp_net_ops on failure pathWANG Cong2015-04-061-0/+1
| | * | | mvneta: dont call mvneta_adjust_link() manuallyStas Sergeev2015-04-061-6/+1
| | * | | ipv6: protect skb->sk accesses from recursive dereference inside the stackhannes@stressinduktion.org2015-04-067-19/+34
| | * | | netns: don't allocate an id for dead netnsNicolas Dichtel2015-04-031-1/+3
| | * | | Revert "netns: don't clear nsid too early on removal"Nicolas Dichtel2015-04-031-15/+9
| | * | | ip6mr: call del_timer_sync() in ip6mr_free_table()WANG Cong2015-04-021-1/+1