summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-07-2253-1162/+1006
|\
| *-----------. Merge branches 'cma', 'cxgb4', 'ipath', 'misc', 'mlx4', 'mthca', 'qib' and 's...Roland Dreier2011-07-2252-1122/+962
| |\ \ \ \ \ \ \
| | | | | | | | * IB/srp: Avoid duplicate devices from LUN scanBart Van Assche2011-07-131-0/+2
| | | | | | | * | IB/qib: Defer HCA error events to taskletMike Marciniszyn2011-07-222-21/+53
| | | | | | | * | IB/qib: Update active link widthMitko Haralanov2011-07-181-3/+23
| | | | | | | * | IB/qib: Fix potential deadlock with link down interruptRam Vepa2011-07-181-2/+3
| | | | | | | * | IB/qib: Add sysfs interface to read free contextsRam Vepa2011-07-181-0/+14
| | | | | | | * | IB/qib: Remove double defineEdwin van Vliet2011-07-181-1/+0
| | | | | | | * | IB/qib: Remove unnecessary read of PCI_CAP_ID_EXPJon Mason2011-07-181-4/+4
| | | | | | | * | IB/qib: Convert old cpumask api into new oneMotohiro KOSAKI2011-07-181-5/+6
| | | | | | | * | MAINTAINERS: Update ipath/qib (QLogic IB adapter) entriesMike Marciniszyn2011-07-131-3/+8
| | | | | | | |/
| | | | | | * | IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXPJon Mason2011-07-182-2/+2
| | | | | | * | IB/mthca: Stop returning separate error and status from FW commandsGoldwyn Rodrigues2011-07-1512-611/+342
| | | | | | |/
| | | | | * | mlx4_core: Bump the driver version to 1.0Dotan Barak2011-07-211-2/+2
| | | | | * | IB/mlx4: Support PMA counters for IBoEOr Gerlitz2011-07-181-1/+67
| | | | | * | IB/mlx4: Use flow counters on IBoE portsOr Gerlitz2011-07-184-4/+29
| | | | | * | IB/pma: Add include file for IBA performance counters definitionsOr Gerlitz2011-07-184-344/+231
| | | | | * | mlx4_core: Add network flow countersOr Gerlitz2011-07-186-2/+86
| | | | | * | mlx4_core: Fix location of counter index in QP context structOr Gerlitz2011-07-181-3/+2
| | | | | * | mlx4_core: Read extended capabilities into the flags fieldOr Gerlitz2011-07-1811-50/+47
| | | | | * | mlx4_core: Extend capability flags to 64 bitsOr Gerlitz2011-07-183-22/+23
| | | | | * | IB/mlx4: Generate GID change events in IBoE codeOr Gerlitz2011-07-181-1/+1
| | | | | * | IB/core: Add GID change eventOr Gerlitz2011-07-182-2/+4
| | | | | |/
| | | | * | RDMA: Allow for NULL .modify_device() and .modify_port() methodsBart Van Assche2011-07-185-36/+6
| | | | |/
| | | * | IB/ipath: Convert old cpumask api into new oneMotohiro KOSAKI2011-07-181-4/+7
| | | |/
| | * | RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()Manuel Zerpies2011-07-181-4/+5
| | |/
| * | RDMA/cma: Don't allow IPoIB port space for IBoEMoni Shoua2011-07-181-0/+4
| * | RDMA/cma: Avoid assigning an IS_ERR value to cm_id pointer in CMA id objectJack Morgenstein2011-07-181-40/+40
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee...Linus Torvalds2011-07-226-67/+303
|\ \
| * | firewire: document the sysfs ABIsStefan Richter2011-07-161-0/+122
| * | firewire: cdev: ABI documentation enhancementsStefan Richter2011-07-162-41/+137
| * | firewire: cdev: prevent race between first get_info ioctl and bus reset event...Stefan Richter2011-07-162-8/+13
| * | firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVALStefan Richter2011-07-161-1/+1
| * | firewire: ohci: skip soft reset retries after card ejectionStefan Richter2011-07-091-4/+7
| * | firewire: ohci: fix PHY reg access after card ejectionStefan Richter2011-07-091-0/+6
| * | firewire: ohci: add a comment on PHY reg access serializationStefan Richter2011-07-091-0/+6
| * | firewire: ohci: reduce potential context_stop latencyStefan Richter2011-07-091-2/+3
| * | firewire: ohci: remove superfluous posted write flushesClemens Ladisch2011-06-021-9/+5
| * | firewire: net: replacing deprecated __attribute__((packed)) with __packedAugust Lilleaas2011-06-021-2/+3
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2011-07-221296-36138/+93750
|\ \ \
| * | | icmp: Fix regression in nexthop resolution during replies.David S. Miller2011-07-221-6/+8
| * | | Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2011-07-211-4/+14
| |\ \ \
| | * | | vhost: handle wrap around in # of bufs mathShirley Ma2011-07-211-3/+9
| | * | | vhost-net: update used ring on backend changeMichael S. Tsirkin2011-07-211-1/+5
| * | | | net: Fix ppc64 BPF JIT dependencies.David S. Miller2011-07-211-1/+1
| * | | | acenic: include NET_SKB_PAD headroom to incoming skbsEric Dumazet2011-07-211-3/+3
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher...David S. Miller2011-07-217-481/+338
| |\ \ \ \
| | * | | | ixgbe: convert to ndo_fix_featuresDon Skidmore2011-07-213-217/+111
| | * | | | ixgbe: only enable WoL for magic packet by defaultAndy Gospodarek2011-07-211-6/+3
| | * | | | ixgbe: remove ifdef check for non-existent defineEmil Tantilov2011-07-211-2/+0
OpenPOWER on IntegriCloud