Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull mailcap fixlets from Mauro Carvalho Chehab:
"A small fixup for my and Shuah's entries in .mailcap.

Basically, those entries were with a syntax that makes
get_maintainer.pl to do the wrong thing"

* tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
.mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan

+11 -2
+11 -2
.mailmap
··· 96 96 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> 97 97 Mark Brown <broonie@sirena.org.uk> 98 98 Matthieu CASTET <castet.matthieu@free.fr> 99 - Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com> 99 + Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br> 100 + Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> 101 + Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org> 102 + Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com> 103 + Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com> 104 + Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> 105 + Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> 100 106 Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> 101 107 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> 102 108 Mayuresh Janorkar <mayur@ti.com> ··· 138 132 Sascha Hauer <s.hauer@pengutronix.de> 139 133 S.Çağlar Onur <caglar@pardus.org.tr> 140 134 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> 141 - Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com> 135 + Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> 136 + Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com> 137 + Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com> 138 + Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 142 139 Simon Kelley <simon@thekelleys.org.uk> 143 140 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> 144 141 Stephen Hemminger <shemminger@osdl.org>