[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / r8169.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-26 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Neil Hormannet: Remove unused netdev arg from some NAPI interfaces.
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-27 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-21 Stephen Hemmingernetdev: add more functions to netdevice ops
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-20 Francois Romieur8169: convert to net_device_ops
2008-11-19 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-11 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-10 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-07 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
2008-11-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-03 Linus TorvaldsMerge branch 'proc-linus' of git://git./linux/kernel...
2008-11-03 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-31 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29 Jesper NilssonMerge branch 'for-next' of git://jni.nu/cris into cris_...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-10-28 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-28 Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-10-28 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/doc
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-28 Russell KingMerge branch 'fixes' of git://git./linux/kernel/git...
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/uv
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into tracing/urgent
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux-mfd
2008-10-26 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-10-26 Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
2008-10-26 Francois Romieur8169: revert "read MAC address from EEPROM on init"
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-24 Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-23 Takashi IwaiMerge branches 'topic/asoc', 'topic/misc-fixes' and...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-22 Francois Romieur8169: checks against wrong mac addresse init
2008-10-22 Francois Romieur8169: verbose mac address init
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-20 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 Linus TorvaldsMerge branch 'tracing-v28-for-linus' of git://git....
2008-10-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-10-20 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
next