[user]
	name = Tobias Klauser
	email = tklauser@distanz.ch
	signingkey = B5510F47

[core]
	abbrev = 12
	whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol

[alias]
	co = checkout
	st = status
	ci = commit
	br = branch
	d = diff
	ds = diff --stat
	lp = log -p
	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2"

[pretty]
	fixes = Fixes: %h (\"%s\")

[color]
	ui = true
	diff = auto
	branch = auto
	status = auto

[color "diff"]
	whitespace = red reverse

[push]
	default = matching

[merge]
	tool = vimdiff

[grep]
	lineNumber = true

[sendemail]
	smtpserver = mail.zhinst.com
	suppresscc = self
	bcc = Tobias Klauser <tklauser@distanz.ch>

[stash]
	showPatch = true

[tag]
	sort = version:refname

[versionsort]
	prereleaseSuffix = -rc
x</a> : <a href='/cgit.cgi/linux/net-next.git/'>net-next.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='586efded6b8beb932e9a356f351b0c681503358f'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=586efded6b8beb932e9a356f351b0c681503358f'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?id=586efded6b8beb932e9a356f351b0c681503358f'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/?id=586efded6b8beb932e9a356f351b0c681503358f'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/?id=586efded6b8beb932e9a356f351b0c681503358f'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='id' value='586efded6b8beb932e9a356f351b0c681503358f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='586efded6b8beb932e9a356f351b0c681503358f'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Dave Airlie &lt;airlied@redhat.com&gt;</td><td class='right'>2016-08-03 08:40:24 +1000</td></tr>
<tr><th>committer</th><td>Dave Airlie &lt;airlied@redhat.com&gt;</td><td class='right'>2016-08-03 08:40:24 +1000</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?id=586efded6b8beb932e9a356f351b0c681503358f'>586efded6b8beb932e9a356f351b0c681503358f</a> (<a href='/cgit.cgi/linux/net-next.git/patch/?id=586efded6b8beb932e9a356f351b0c681503358f'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=586efded6b8beb932e9a356f351b0c681503358f'>1c9af56fa0d2c70bf93cf5a02429f4b5b7d11007</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?id=dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11'>dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11</a> (<a href='/cgit.cgi/linux/net-next.git/diff/?id=586efded6b8beb932e9a356f351b0c681503358f&amp;id2=dfd2e9ab6a7db56a5f5bb55f71485a92613c8e11'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?id=2fc4d838aaf2607216eda5ce9dba18fa14422a31'>2fc4d838aaf2607216eda5ce9dba18fa14422a31</a> (<a href='/cgit.cgi/linux/net-next.git/diff/?id=586efded6b8beb932e9a356f351b0c681503358f&amp;id2=2fc4d838aaf2607216eda5ce9dba18fa14422a31'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next</div><div class='commit-msg'>Merge generic ZPOS property support, this was backed up behind some other
changes I didn't have a stable branch point for. Now they are merged to Linus
tree this pull is just drm patches.

* 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel:
  drm: rcar: use generic code for managing zpos plane property
  drm/exynos: use generic code for managing zpos plane property
  drm: sti: use generic zpos for plane
  drm: add generic zpos property
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=586efded6b8beb932e9a356f351b0c681503358f'>Diffstat</a></div><table summary='diffstat' class='diffstat'>