summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2014-01-25103-231/+163
|\
| * dt-bindings: add rockchip vendor prefixHeiko Stübner2014-01-231-0/+1
| * serial: vt8500: Add missing binding document for arch-vt8500 serial driver.Tony Prisk2014-01-231-0/+26
| * Merge remote-tracking branch 'grant/devicetree/next' into for-3.14Rob Herring2014-01-233-0/+80
| |\
| | * dt/bindings: submitting patches and ABI documentsJason Cooper2014-01-202-0/+77
| | * of: Fix __of_device_is_available checkXiubo Li2014-01-161-0/+3
| * | DT: Add vendor prefix for Emerging Display TechnologiesLothar Waßmann2014-01-171-0/+1
| * | of: add vendor prefixe for EPFLFlorian Vaussard2014-01-171-0/+1
| * | of: add vendor prefix for GumstixFlorian Vaussard2014-01-171-0/+1
| * | of: add vendor prefix for Ka-Ro electronics GmbHLothar Waßmann2014-01-171-0/+1
| * | Merge remote-tracking branch 'grant/devicetree/next' into for-3.14Rob Herring2014-01-171262-6237/+11796
| |\|
| | * dt/bindings: Remove device_type "serial" from marvell,mv64360-mpscGrant Likely2014-01-165-8/+2
| | * dt/bindings: remove device_type "network" referencesGrant Likely2014-01-167-10/+0
| | * dt/bindings: remove users of device_type "mdio"Grant Likely2014-01-168-9/+0
| | * dt/bindings: Remove references to linux,phandle propertiesGrant Likely2014-01-162-6/+0
| | * dt/bindings: Remove all references to device_type "ethernet-phy"Grant Likely2014-01-1685-180/+0
| * | devicetree: macb: Document clock propertiesSoren Brinkmann2014-01-161-0/+6
| * | dts: bindings: trivial clock bindings doc fixesGerhard Sittig2014-01-161-1/+1
| * | of: irq: Ignore disabled intc's when searching mapPeter Crosthwaite2013-12-041-0/+3
| * | of: irq: Ignore disabled interrupt controllersPeter Crosthwaite2013-12-041-1/+2
| * | OF: base: match each node compatible against all given matches firstSebastian Hesselbarth2013-12-041-16/+37
| * | dt-bindings: add GIC-400 bindingRob Herring2013-12-041-0/+1
* | | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2014-01-25100-567/+7663
|\ \ \
| * \ \ Merge branch 'ip-roce' into for-nextRoland Dreier2014-01-2336-389/+939
| |\ \ \
| | * | | IB/mlx4: Use IS_ENABLED(CONFIG_IPV6)Roland Dreier2014-01-201-6/+6
| | * | | RDMA/ocrdma: Add dependency on INETRoland Dreier2014-01-201-1/+1
| | * | | RDMA/ocrdma: Move ocrdma_inetaddr_event outside of "#if CONFIG_IPV6"Roland Dreier2014-01-201-4/+4
| | * | | IB/mlx4: Add dependency INETMatan Barak2014-01-201-1/+1
| | * | | IB/cm: Fix missing unlock on error in cm_init_qp_rtr_attr()Wei Yongjun2014-01-201-1/+3
| | * | | IB/core: Make ib_addr a core IB moduleMatan Barak2014-01-202-4/+6
| | * | | IB/core: Resolve Ethernet L2 addresses when modifying QPOr Gerlitz2014-01-203-0/+49
| | * | | RDMA/ocrdma: Populate GID table with IP based gidsMoni Shoua2014-01-202-99/+41
| | * | | RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-204-22/+17
| | * | | IB/mlx4: Handle Ethernet L2 parameters for IP based GID addressingMoni Shoua2014-01-186-62/+130
| | * | | IB/mlx4: Use IBoE (RoCE) IP based GIDs in the port GID tableMoni Shoua2014-01-182-143/+334
| | * | | IB/cma: IBoE (RoCE) IP-based GID addressingMoni Shoua2014-01-183-47/+28
| | * | | IB/core: Ethernet L2 attributes in verbs/cm structuresMatan Barak2014-01-1418-24/+343
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----------------. \ \ \ Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', ...Roland Dreier2014-01-2373-176/+6719
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | IB/usnic: Remove unused includes of <linux/version.h>Wei Yongjun2014-01-233-3/+0
| | | | | | | | | | | * | | | IB/usnic: Use GFP_ATOMIC under spinlockDan Carpenter2014-01-211-1/+1
| | | | | | | | | | | * | | | IB/usnic: Remove unused variable in usnic_debugfs_exit()Wei Yongjun2014-01-181-4/+0
| | | | | | | | | | | * | | | IB/usnic: Set userspace/kernel ABI ver to 4Upinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | | | IB/usnic: Advertise usNIC devices as RDMA_NODE_USNIC_UDPUpinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | | | IB/core: Add support for RDMA_NODE_USNIC_UDPUpinder Malhi2014-01-183-0/+4
| | | | | | | | | | | * | | | IB/usnic: Add dependency on CONFIG_INETUpinder Malhi2014-01-181-1/+1
| | | | | | | | | | | * | | | IB/usnic: Fix endianness-related warningsUpinder Malhi2014-01-182-3/+2
| | | | | | | | | | | * | | | IB/usnic: Append documentation to usnic_transport.h and cleanupUpinder Malhi2014-01-142-1/+4
| | | | | | | | | | | * | | | IB/usnic: Fix typo "Ignorning" -> "Ignoring"Roland Dreier2014-01-141-4/+4
| | | | | | | | | | | * | | | IB/usnic: Expose flows via debugfsUpinder Malhi2014-01-146-10/+111
| | | | | | | | | | | * | | | IB/usnic: Use for_each_sg instead of a for-loopUpinder Malhi2014-01-141-8/+9