]> git.kernelconcepts.de Git - karo-tx-linux.git/history - drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
net: stmmac: fix bad merge conflict resolution
[karo-tx-linux.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_platform.c
2013-09-06 Olof Johanssonnet: stmmac: fix bad merge conflict resolution
2013-09-05 Linus TorvaldsMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-09-05 Linus TorvaldsMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-09-05 Linus TorvaldsMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-09-05 Linus TorvaldsMerge branch 'timers-urgent-for-linus' of git://git...
2013-09-05 Linus TorvaldsMerge branch 'x86-urgent-for-linus' of git://git.kernel...
2013-09-05 David S. MillerMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-09-05 Linus TorvaldsMerge branch 'v4l_for_linus' of git://git.kernel.org...
2013-09-05 Linus TorvaldsMerge branch 'drm-next' of git://people.freedesktop...
2013-09-05 Linus TorvaldsMerge tag 'fbdev-3.12' of git://git.kernel.org/pub...
2013-09-05 Linus TorvaldsMerge tag 'fbdev-3.12-omap-legacy-removal' of git:...
2013-09-05 Linus TorvaldsMerge tag 'rdma-for-linus' of git://git.kernel.org...
2013-09-05 Linus TorvaldsMerge branch 'i2c/for-next' of git://git.kernel.org...
2013-09-05 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.org/pub...
2013-09-05 Linus TorvaldsMerge branch 'next' of git://git.kernel.org/pub/scm...
2013-09-05 Linus TorvaldsMerge tag 'stable/for-linus-3.12-rc0-tag' of git:/...
2013-09-05 Linus TorvaldsMerge tag 'modules-next-for-linus' of git://git.kernel...
2013-09-05 Linus TorvaldsMerge tag 'PTR_RET-for-linus' of git://git.kernel.org...
2013-09-05 Linus TorvaldsMerge tag 'dlm-3.12' of git://git.kernel.org/pub/scm...
2013-09-05 Linus TorvaldsMerge tag 'ext4_for_linus' of git://git.kernel.org...
2013-09-04 Linus TorvaldsMerge tag 'sound-3.12' of git://git.kernel.org/pub...
2013-09-04 Linus TorvaldsMerge tag 'pinctrl-v3.12-1' of git://git.kernel.org...
2013-09-04 Linus TorvaldsMerge branch 'x86-spinlocks-for-linus' of git://git...
2013-09-04 Linus TorvaldsMerge branch 'x86-smap-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'x86-ras-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'x86-platform-for-linus' of git://git...
2013-09-04 Linus TorvaldsMerge branch 'x86-paravirt-for-linus' of git://git...
2013-09-04 Linus TorvaldsMerge branch 'x86-mm-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'x86-kaslr-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'timers-nohz-for-linus' of git://git.kerne...
2013-09-04 Linus TorvaldsMerge branch 'x86-fb-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'x86-cpu-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branches 'x86-boot-for-linus' and 'x86-cleanups...
2013-09-04 Linus TorvaldsMerge branch 'x86-asmlinkage-for-linus' of git://git...
2013-09-04 Linus TorvaldsMerge branch 'x86-asm-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'x86-apic-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branch 'timers-core-for-linus' of git://git.kerne...
2013-09-04 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git.kernel...
2013-09-04 Linus TorvaldsMerge branches 'perf-urgent-for-linus' and 'perf-core...
2013-09-04 Linus TorvaldsMerge branch 'core-locking-for-linus' of git://git...
2013-09-04 Linus TorvaldsMerge tag 'for-3.12-rc1' of git://gitorious.org/linux...
2013-09-04 Linus TorvaldsMerge tag 'please-pull-pstore' of git://git.kernel...
2013-09-04 David S. MillerMerge branch 'for-davem' of git://gitorious.org/linux...
2013-09-04 David S. MillerMerge branch 'for-davem' of git://git.kernel.org/pub...
2013-09-04 Linus TorvaldsMerge branch 'for-3.12' of git://git.kernel.org/pub...
2013-09-04 Linus TorvaldsMerge branch 'for-3.12' of git://git.kernel.org/pub...
2013-09-04 Linus TorvaldsMerge branch 'for-3.12' of git://git.kernel.org/pub...
2013-09-04 Linus TorvaldsMerge branch 'for-3.12' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge tag 'pci-v3.12-changes' of git://git.kernel.org...
2013-09-03 Linus TorvaldsMerge tag 'pm+acpi-3.12-rc1' of git://git.kernel.org...
2013-09-03 Linus TorvaldsMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-09-03 Linus TorvaldsMerge tag 'scsi-misc' of git://git.kernel.org/pub/scm...
2013-09-03 Linus TorvaldsMerge tag 'tty-3.12-rc1' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge tag 'staging-3.12-rc1' of git://git.kernel.org...
2013-09-03 Linus TorvaldsMerge tag 'driver-core-3.12-rc1' of git://git.kernel...
2013-09-03 Linus TorvaldsMerge tag 'char-misc-3.12-rc1' of git://git.kernel...
2013-09-03 Linus TorvaldsMerge tag 'usb-3.12-rc1' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge tag 'hwmon-for-linus' of git://git.kernel.org...
2013-09-03 Linus TorvaldsMerge tag 'regulator-v3.12' of git://git.kernel.org...
2013-09-03 Linus TorvaldsMerge tag 'spi-v3.12' of git://git.kernel.org/pub/scm...
2013-09-03 Linus TorvaldsMerge tag 'regmap-v3.12' of git://git.kernel.org/pub...
2013-09-03 Linus TorvaldsMerge branch 'lockref' (locked reference counts)
2013-09-03 Ingo MolnarMerge branch 'rcu/next' of git://git.kernel.org/pub...
2013-09-02 Linus TorvaldsMerge tag 'scsi-fixes' of git://git.kernel.org/pub...
2013-09-02 Linus TorvaldsMerge branch 'x86-urgent-for-linus' of git://git.kernel...
2013-09-02 Linus TorvaldsMerge branch 'fixes' of git://git.infradead.org/users...
2013-09-01 Mark BrownMerge remote-tracking branch 'regulator/topic/lp8755...
2013-09-01 Mark BrownMerge remote-tracking branch 'spi/topic/tle62x0' into...
2013-09-01 David S. MillerMerge branch 'for-davem' of git://git.kernel.org/pub...
2013-08-31 Linus TorvaldsMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-08-30 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.org/pub...
2013-08-30 Jingoo Hannet: stmmac: use dev_get_platdata()
2013-08-30 Sonic Zhangdriver:net:stmmac: Disable DMA store and forward mode...
2013-08-29 David S. MillerMerge branch 'master' of git://git.kernel.org/pub/scm...
2013-08-29 John W. LinvilleMerge branch 'master' of git://git.kernel.org/pub/scm...
2013-08-28 Alexander GrafMerge remote-tracking branch 'origin/next' into kvm...
2013-08-28 Byungho Annet: stmmac: fixed the pbl setting with DT
2013-08-26 David S. MillerMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-08-23 Linus TorvaldsMerge branch 'for-3.11-fixes' of git://git.kernel.org...
2013-08-22 Dave AirlieMerge branch 'drm-nouveau-next' of git://anongit.freede...
2013-08-21 Linus TorvaldsMerge tag 'stable/for-linus-3.11-rc6-tag' of git:/...
2013-08-21 Ben HutchingsMerge branch 'sfc-3.11'
2013-08-18 Linus TorvaldsMerge branch 'for-3.11-fixes' of git://git.kernel.org...
2013-08-16 David S. MillerMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-08-12 John W. LinvilleMerge branch 'master' of git://git.kernel.org/pub/scm...
2013-08-12 Ingo MolnarMerge branch 'x86/mce' into x86/ras
2013-08-09 Linus TorvaldsMerge branch 'v4l_for_linus' of git://git.kernel.org...
2013-08-06 Linus TorvaldsMerge branch 'for-3.11-fixes' of git://git.kernel.org...
2013-08-04 David S. MillerMerge git://git.kernel.org/pub/scm/linux/kernel/git...
2013-08-02 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.org/pub...
2013-08-02 Tejun Heocgroup: Merge branch 'for-3.11-fixes' into for-3.12
2013-07-31 John W. LinvilleMerge branch 'master' of git://git.kernel.org/pub/scm...
2013-07-31 Linus TorvaldsMerge tag 'stable/for-linus-3.11-rc3-tag' of git:/...
2013-07-30 Dave AirlieMerge branch 'drm-nouveau-next' of git://anongit.freede...
2013-07-30 Linus TorvaldsMerge tag 'firewire-fix' of git://git.kernel.org/pub...
2013-07-28 David S. MillerMerge branch 'minnow/net-next' of git://git.infradead...
2013-07-25 Daniel VetterMerge commit 'Merge branch 'drm-fixes' of git://people...
2013-07-25 Wolfram Sangdrivers/net/ethernet/stmicro/stmmac: don't check resour...
next