Merge tag 'regulator-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
[deliverable/linux.git] / Documentation / CodeOfConflict
2015-03-10  Linus TorvaldsMerge tag 'regulator-v4.0-rc2' of git://git./linux...
2015-03-10  Linus TorvaldsMerge tag 'spi-v4.0-rc2' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge tag 'fbdev-fixes-4.0' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-10  Linus TorvaldsMerge branch 'for-4.0-fixes' of git://git./linux/kernel...
2015-03-09  James MorrisMerge branch 'for-current' of https://github.com/PeterH...
2015-03-08  Linus TorvaldsMerge tag 'usb-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'tty-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'staging-4.0-rc3' of git://git./linux/kernel...
2015-03-08  Linus TorvaldsMerge tag 'char-misc-4.0-rc3' of git://git./linux/kerne...
2015-03-08  Linus TorvaldsMerge tag 'cc-4.0-rc2' of git://git./linux/kernel/git...
2015-02-27  Greg Kroah-HartmanCode of Conflict
This page took 5.092448 seconds and 20 git commands to generate.