Viresh Kumar 9cc236827f Shiraz has moved ...

shiraz.hashim@st.com email-id doesn't exist anymore as he has left the
company.  Replace ST's id with shiraz.linux.kernel@gmail.com.

It also updates .mailmap file to fix address for 'git shortlog'.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2014-04-18 16:40:08 -07:00

..

boot

Shiraz has moved

2014-04-18 16:40:08 -07:00

common

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

configs

Update bcm_defconfig with new pinctrl CONFIG

2014-04-14 09:39:33 +02:00

crypto

…

firmware

…

include

Merge git://git.infradead.org/users/eparis/audit

2014-04-12 12:38:53 -07:00

kernel

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2014-04-11 11:56:40 -07:00

kvm

Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-04-07 14:55:46 -07:00

lib

…

mach-at91

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-bcm

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-berlin

…

mach-clps711x

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-cns3xxx

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-davinci

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-dove

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-ebsa110

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-efm32

…

mach-ep93xx

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-exynos

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-footbridge

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-gemini

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-highbank

…

mach-hisi

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-imx

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-integrator

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-iop13xx

…

mach-iop32x

…

mach-iop33x

…

mach-ixp4xx

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-keystone

Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:29:04 -07:00

mach-kirkwood

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-ks8695

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-lpc32xx

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-mmp

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-moxart

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-msm

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-mv78xx0

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-mvebu

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-mxs

Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:29:04 -07:00

mach-netx

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-nomadik

…

mach-nspire

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-omap1

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-omap2

Merge tag 'fbdev-omap-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2014-04-07 10:47:51 -07:00

mach-orion5x

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-picoxcell

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

mach-prima2

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

mach-pxa

Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2014-04-05 18:32:31 -07:00

mach-qcom

…

mach-realview

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-rockchip

…

mach-rpc

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-s3c24xx

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

mach-s3c64xx

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-s5p64x0

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-s5pc100

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-s5pv210

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mach-sa1100

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-shmobile

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

mach-socfpga

Merge tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux

2014-04-05 18:39:18 -07:00

mach-spear

Shiraz has moved

2014-04-18 16:40:08 -07:00

mach-sti

…

mach-sunxi

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-tegra

Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 14:19:54 -07:00

mach-u300

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-ux500

Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:29:04 -07:00

mach-versatile

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

mach-vexpress

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2014-04-11 11:56:40 -07:00

mach-vt8500

…

mach-w90x900

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00

mach-zynq

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

mm

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2014-04-11 11:56:40 -07:00

net

net: filter: add jited flag to indicate jit compiled filters

2014-03-31 00:45:08 -04:00

nwfpe

…

oprofile

…

plat-iop

…

plat-omap

Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:29:04 -07:00

plat-orion

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

plat-pxa

…

plat-samsung

Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP

2014-04-07 16:36:11 -07:00

plat-versatile

…

tools

…

vfp

ARM: 8018/1: Add {inc,dec}_preempt_count asm macros

2014-04-09 13:08:08 +01:00

xen

…

Kconfig

Merge git://git.infradead.org/users/eparis/audit

2014-04-12 12:38:53 -07:00

Kconfig-nommu

…

Kconfig.debug

Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:46:37 -07:00

Makefile

Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 13:51:19 -07:00