summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-08-093-6/+6
|\
| * NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOADSamuel Ortiz2013-07-313-6/+6
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-08-014-46/+305
|\ \
| * | cfg80211/mac80211: use reduced txpower for 5 and 10 MHzSimon Wunderlich2013-07-161-0/+27
| * | cfg80211/mac80211: get mandatory rates based on scan widthSimon Wunderlich2013-07-161-1/+3
| * | mac80211: add radiotap flag and handling for 5/10 MHzSimon Wunderlich2013-07-162-0/+8
| * | mac80211/rc80211: add chandef to rate initializationSimon Wunderlich2013-07-161-0/+2
| * | nl80211: add scan width to bss and scan request structsSimon Wunderlich2013-07-162-3/+69
| * | cfg80211/nl80211: Add packet coalesce supportAmitkumar Karwar2013-07-162-2/+142
| * | wireless: indent kernel-doc with tabsJohannes Berg2013-07-162-20/+20
| * | nl80211: enable HT overrides for ibssSimon Wunderlich2013-07-161-0/+5
| * | cfg80211/nl80211: rename packet pattern related structures and enumsAmitkumar Karwar2013-07-162-21/+30
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-07-251-2/+3
|\ \ \ | | |/ | |/|
| * | ssb: fix alignment of struct bcma_device_idArnd Bergmann2013-07-181-2/+3
| |/
* | bcma: add constants for new ARM based SoCsHauke Mehrtens2013-07-221-0/+5
* | bcma: add some more core namesHauke Mehrtens2013-07-221-0/+12
|/
* Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-07-142-23/+42
|\
| * slab: add kmalloc() to kernel API documentationMichael Opdenacker2013-07-072-12/+14
| * slob: Rework #ifdeffery in slab.hChristoph Lameter2013-06-181-11/+28
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-07-144-19/+14
|\ \
| * | rpc_create_*_dir: don't bother with qstrAl Viro2013-07-141-2/+2
| * | llist: llist_add() can use llist_add_batch()Oleg Nesterov2013-07-131-10/+4
| * | llist: fix/simplify llist_add() and llist_add_batch()Oleg Nesterov2013-07-131-12/+7
| * | fput: turn "list_head delayed_fput_list" into llist_headOleg Nesterov2013-07-131-0/+2
| * | Safer ABI for O_TMPFILEAl Viro2013-07-131-2/+6
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-07-133-16/+18
|\ \ \
| * | | net: rename busy poll socket op and globalsEliezer Tamir2013-07-102-5/+5
| * | | net: rename ll methods to busy-pollEliezer Tamir2013-07-102-11/+13
| * | | net: rename include/net/ll_poll.h to include/net/busy_poll.hEliezer Tamir2013-07-101-0/+0
* | | | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2013-07-131-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'linus' into timers/urgentThomas Gleixner2013-07-12325-1834/+5824
| |\ \ \ \
| * \ \ \ \ Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/f...Ingo Molnar2013-07-101-1/+1
| |\ \ \ \ \
| | * | | | | watchdog: Rename confusing state variableFrederic Weisbecker2013-06-201-1/+1
* | | | | | | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2013-07-133-359/+379
|\ \ \ \ \ \ \
| * | | | | | | mutex: Move ww_mutex definitions to ww_mutex.hMaarten Lankhorst2013-07-123-359/+379
* | | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-132-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | MIPS: BCM63XX: recognize Cable Modem firmware formatFlorian Fainelli2013-07-012-0/+25
* | | | | | | | | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2013-07-1314-17/+2673
|\ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge branches 'mlx5', 'qib' and 'srp' into for-nextRoland Dreier2013-07-111-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB specMoshe Lazer2013-07-111-2/+2
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. | | | | | | | | | | Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' in...Roland Dreier2013-07-088-2/+2498
| |\ \| | | | | | | | | | | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | mlx5: Fix parameter type of health_handler_tRoland Dreier2013-07-081-1/+1
| | | * | | | | | | | | mlx5: Add driver for Mellanox Connect-IB adaptersEli Cohen2013-07-087-0/+2465
| | | * | | | | | | | | IB/core: Add reserved values to enums for low-level driver useJack Morgenstein2013-07-071-2/+33
| | |/ / / / / / / / /
| * | | | | | | | | | RDMA/ucma: Allow user space to specify AF_IB when joining multicastSean Hefty2013-06-201-1/+11
| * | | | | | | | | | RDMA/ucma: Allow user space to pass AF_IB into resolveSean Hefty2013-06-201-1/+12
| * | | | | | | | | | RDMA/ucma: Allow user space to bind to AF_IBSean Hefty2013-06-201-1/+9
| * | | | | | | | | | RDMA/ucma: Name changes to indicate only IP addresses supportedSean Hefty2013-06-201-6/+6
| * | | | | | | | | | RDMA/ucma: Add ability to query GID addressesSean Hefty2013-06-201-1/+2
| * | | | | | | | | | RDMA/cma: Export cma_get_service_id()Sean Hefty2013-06-201-0/+7