aboutsummaryrefslogtreecommitdiffstats
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 10:35:17 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-29 10:35:17 -0700
commitebc2e5a593ce7082bed03b2d22e2fe83583a9f5d (patch)
tree2455e6eaba3f324d883ee90069019388e80eb16e /diffcore-pickaxe.c
parentMerge branch 'da/mergetool-meld' into maint (diff)
parentpack-objects: turn off bitmaps when we split packs (diff)
downloadgit-ebc2e5a593ce7082bed03b2d22e2fe83583a9f5d.tar.gz
git-ebc2e5a593ce7082bed03b2d22e2fe83583a9f5d.zip
Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint
* jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions
'insertions'>+57 2018-07-19mlxsw: reg: Add Policy-Engine Region Association RegisterJiri Pirko1-0/+43 2018-07-19mlxsw: acl: Introduce activity get operation for action block/setJiri Pirko3-0/+35 2018-07-19mlxsw: reg: Add support for activity information from PEFA registerJiri Pirko2-6/+45 2018-07-19mlxsw: spectrum: Introduce flex key blocks for Spectrum-2Jiri Pirko2-0/+111 2018-07-19mlxsw: spectrum: Add Spectrum-2 variant of flex actions opsJiri Pirko2-0/+13 2018-07-19mlxsw: spectrum_mr_tcam: Add Spectrum-2 stubsJiri Pirko3-1/+86 2018-07-19mlxsw: spectrum: Add KVDL manager implementation for Spectrum-2Jiri Pirko3-1/+307 2018-07-19mlxsw: reg: Add Infrastructure Entry Delete RegisterJiri Pirko1-0/+62 2018-07-18net/rds: Remove unnecessary variableHåkon Bugge1-2/+1 2018-07-18net/rds: void function cannot return -1Håkon Bugge1-2/+0 2018-07-18dsa: rtl8366: Remove unused variable.David S. Miller1-1/+0 2018-07-18ravb: fix byte order for TX descriptor tag field lower bitsNiklas Söderlund1-1/+1 2018-07-18ravb: fix warning about memcpy lengthNiklas Söderlund1-1/+1 2018-07-18ravb: fix shadowing of symbol 'stats' in ravb_get_ethtool_stats()Niklas Söderlund1-1/+1 2018-07-18ARM: dts: Add ethernet and switch to D-Link DIR-685Linus Walleij1-1/+139 2018-07-18net: dsa: realtek-smi: Add Realtek SMI driverLinus Walleij7-0/+2591