[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / sis900.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-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-25 Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/asoc' 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 branch 'x86/iommu' into x86/core
2008-12-23 Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19 Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
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-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 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
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/irq
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into sched/core
2008-12-10 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-08 Ingo MolnarMerge branch 'linus' into x86/quirks
2008-12-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-05 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/function...
2008-12-05 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-12-05 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-05 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-05 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-12-05 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04 James MorrisMerge branch 'master' into next
2008-12-04 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03 Paul MackerrasMerge branch 'merge'
2008-12-03 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-02 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-12-02 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-12-02 Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-12-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
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 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-26 Ingo Molnarsis900: fix warning in drivers/net/sis900.c
2008-11-25 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-23 Qinghuang Fengdriver/net/*: remove redundant argument comments
2008-11-22 David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-11-22 Stephen Hemmingersis900: convert to net_device_ops
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-13 Wang Chennetdevice: safe convert to netdev_priv() #part-3
2008-11-11 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
2008-10-31 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Johannes Bergnet: convert print_mac to %pM
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-02 Ingo MolnarMerge commit 'v2.6.27-rc8' into genirq
2008-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
2008-08-18 Jesse BarnesMerge branch 'pci-for-jesse' of git://git./linux/kernel...
2008-08-11 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-08-11 Ingo MolnarMerge branch 'linus' into core/rcu
2008-08-08 Ben DooksMerge ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
2008-08-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-06 Wim Van Sebroeck[WATCHDOG] Merge code clean-up's from Alan Cox.
2008-08-01 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-08-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-07-31 Ingo MolnarMerge branch 'linus' into timers/hpet
2008-07-30 Ingo MolnarMerge branch 'x86/core' into x86/xsave
2008-07-29 Anton VorontsovMerge branch 'master' of /home/cbou/linux-2.6
2008-07-28 Ingo MolnarMerge branch 'linus' into core/generic-dma-coherent
2008-07-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-28 Ingo MolnarMerge branch 'x86/crashdump' into x86/urgent
2008-07-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-27 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-07-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-27 Haavard SkinnemoenMerge commit 'upstream/master'
next