bpf: introduce current->pid, tgid, uid, gid, comm accessors
[firefly-linux-kernel-4.4.55.git] / Documentation / CodeOfConflict
2015-05-13 Arnd BergmannMerge tag 'v4.1-rockchip-socfixes2' of git://git./linux...
2015-05-11 Mark BrownMerge remote-tracking branches 'spi/fix/fsl-cpm', ...
2015-05-07 Arnd BergmannMerge tag 'v4.1-rockchip-socfixes1' of git://git./linux...
2015-05-06 Ingo MolnarMerge tag 'efi-urgent' of git://git./linux/kernel/git...
2015-05-04 Linus TorvaldsMerge tag 'for_linus_stable' of git://git./linux/kernel...
2015-04-29 Mark BrownMerge remote-tracking branches 'asoc/fix/rt5677', ...
2015-04-29 Mark BrownMerge remote-tracking branches 'asoc/fix/email', 'asoc...
2015-04-29 Mark BrownMerge remote-tracking branch 'asoc/fix/rt5645' into...
2015-04-29 Mark BrownMerge remote-tracking branch 'asoc/fix/dapm' into asoc...
2015-04-28 Kalle ValoMerge ath-next from ath.git
2015-04-27 Linus TorvaldsMerge git://git.infradead.org/intel-iommu
2015-04-26 Linus TorvaldsMerge tag 'platform-drivers-x86-v4.1-1' of git://git...
2015-04-26 Linus TorvaldsMerge tag 'chrome-for-linus' of git://git./linux/kernel...
2015-04-24 Linus TorvaldsMerge branch 'for-next' of git://git./linux/kernel...
2015-04-24 Linus TorvaldsMerge tag 'pwm/for-4.1-rc1' of git://git./linux/kernel...
2015-04-24 Linus TorvaldsMerge branch 'for-linus' of git://git.infradead.org...
2015-04-24 Linus TorvaldsMerge tag 'xfs-for-linus-4.1-rc1' of git://git./linux...
2015-04-24 Mark BrownMerge remote-tracking branches 'spi/fix/bcm2835', ...
2015-04-23 Russell KingMerge branches 'misc' and 'vdso' into for-next
2015-04-22 Linus TorvaldsMerge branch 'upstream' of git://git.infradead.org...
2015-04-22 Linus TorvaldsMerge tag 'for-linus-20150422' of git://git.infradead...
2015-04-22 Linus TorvaldsMerge tag 'armsoc-late' of git://git./linux/kernel...
2015-04-22 Linus TorvaldsMerge tag 'armsoc-arm64' of git://git./linux/kernel...
2015-04-22 Linus TorvaldsMerge tag 'armsoc-defconfig' of git://git./linux/kernel...
2015-04-22 Linus TorvaldsMerge tag 'armsoc-multiplatform' of git://git./linux...
2015-04-22 Linus TorvaldsMerge tag 'armsoc-soc' of git://git./linux/kernel/git...
2015-04-21 NeilBrownMerge branch 'cluster' into for-next
2015-04-21 Linus TorvaldsMerge tag 'clk-for-linus-4.1' of git://git./linux/kerne...
2015-04-21 Mauro Carvalho ChehabMerge branch 'drm-next-merged' of git://people.freedesk...
2015-04-20 Linus TorvaldsMerge tag 'remoteproc-4.1-next' of git://git./linux...
2015-04-20 Linus TorvaldsMerge branch 'misc' of git://git./linux/kernel/git...
2015-04-20 Linus TorvaldsMerge tag 'scsi-misc' of git://git./linux/kernel/git...
2015-04-20 Linus TorvaldsMerge tag 'fbdev-4.1' of git://git./linux/kernel/git...
2015-04-20 Linus TorvaldsMerge tag 'cpumask-next-for-linus' of git://git./linux...
2015-04-20 Olof JohanssonMerge branch 'fixes' into next/fixes-non-critical
2015-04-19 Linus TorvaldsMerge tag 'ext4_for_linus' of git://git./linux/kernel...
2015-04-18 Linus TorvaldsMerge tag 'for-f2fs-4.1' of git://git./linux/kernel...
2015-04-18 Linus TorvaldsMerge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
2015-04-18 Linus TorvaldsMerge tag 'gpio-v4.1-1' of git://git./linux/kernel...
2015-04-17 Linus TorvaldsMerge git://git./linux/kernel/git/cmetcalf/linux-tile
2015-04-17 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2015-04-16 Linus TorvaldsMerge tag 'scsi-misc' of git://git./linux/kernel/git...
2015-04-16 Linus TorvaldsMerge branch 'mailbox-for-next' of git://git.linaro...
2015-04-16 Linus TorvaldsMerge tag 'for-linus' of git://linux-c6x.org/git/projec...
2015-04-15 Linus TorvaldsMerge branch 'for-next' of git://git./linux/kernel...
2015-04-15 Dave AirlieMerge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux...
2015-04-15 Linus TorvaldsMerge branch 'kconfig' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge branch 'kbuild' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2015-04-15 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2015-04-15 Linus TorvaldsMerge tag 'pinctrl-v4.1-1' of git://git./linux/kernel...
2015-04-15 Linus TorvaldsMerge tag 'mfd-for-linus-4.1' of git://git./linux/kerne...
2015-04-14 Linus TorvaldsMerge tag 'gfs2-merge-window' of git://git./linux/kerne...
2015-04-14 Russell KingMerge branch 'devel-stable' into for-next
2015-04-14 Linus TorvaldsMerge branch 'timers-nohz-for-linus' of git://git....
2015-04-14 Linus TorvaldsMerge tag 'trace-4.1-tracefs' of git://git./linux/kerne...
2015-04-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-04-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-04-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2015-04-14 Dmitry TorokhovMerge branch 'next' into for-linus
2015-04-14 Chris ZankelMerge tag 'v4.0' into for_next
2015-04-13 Arnd BergmannMerge tag 'at91-clocksource-driver2' of git://git....
2015-04-13 Linus TorvaldsMerge branch 'for-4.1' of git://git./linux/kernel/git...
2015-04-13 Linus TorvaldsMerge branch 'for-4.1' of git://git./linux/kernel/git...
2015-04-13 Arnd BergmannMerge tag 'mvebu-fixes-4.0-2' of git://git.infradead...
2015-04-13 Arnd BergmannMerge tag 'v4.0-next-soc-fix' of https://github.com...
2015-04-13 Linus TorvaldsMerge tag 'hsi-for-4.1' of git://git./linux/kernel...
2015-04-13 Linus TorvaldsMerge tag 'for-v4.1' of git://git.infradead.org/battery-2.6
2015-04-13 Linus TorvaldsMerge tag 'regmap-v4.1' of git://git./linux/kernel...
2015-04-13 Linus TorvaldsMerge tag 'edac_for_4.1' of git://git./linux/kernel...
2015-04-13 Linus TorvaldsMerge branch 'x86-ras-for-linus' of git://git./linux...
2015-04-13 Linus TorvaldsMerge branch 'x86-mm-for-linus' of git://git./linux...
2015-04-13 Linus TorvaldsMerge branch 'x86-microcode-for-linus' of git://git...
2015-04-13 Linus TorvaldsMerge branch 'x86-debug-for-linus' of git://git./linux...
2015-04-13 Linus TorvaldsMerge branch 'x86-cpu-for-linus' of git://git./linux...
2015-04-13 Linus TorvaldsMerge branch 'x86-cleanups-for-linus' of git://git...
2015-04-13 Linus TorvaldsMerge branch 'x86-boot-for-linus' of git://git./linux...
2015-04-13 Linus TorvaldsMerge branch 'locking-core-for-linus' of git://git...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/wm2200'...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/tegra',...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/rt5641'...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/omap', ...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/link-param...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/jack', ...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/dmaengine...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/cx20442...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/topic/4554', ...
2015-04-12 Mark BrownMerge remote-tracking branch 'asoc/topic/rt5645' into...
2015-04-12 Mark BrownMerge remote-tracking branch 'asoc/topic/dapm' into...
2015-04-12 Mark BrownMerge tag 'asoc-v4.1' into asoc-next
2015-04-12 Mark BrownMerge remote-tracking branch 'asoc/fix/wm8741' into...
2015-04-12 Mark BrownMerge remote-tracking branches 'asoc/fix/ak4642', ...
2015-04-12 Mark BrownMerge remote-tracking branch 'asoc/fix/pcm512x' into...
2015-04-12 Mark BrownMerge remote-tracking branch 'asoc/fix/intel' into...
2015-04-12 Mark BrownMerge tag 'asoc-fix-v4.0-rc7' into asoc-linus
2015-04-12 Al ViroMerge branch 'iov_iter' into for-next
2015-04-12 Al ViroMerge branch 'iocb' into for-next
2015-04-11 Linus TorvaldsMerge tag 'asoc-fix-v4.0-rc7' of git://git./linux/kerne...
2015-04-11 Mark BrownMerge remote-tracking branches 'spi/topic/spidev' and...
2015-04-11 Mark BrownMerge remote-tracking branches 'spi/topic/qup', 'spi...
next