[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / hp-plus.c
2008-10-10 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-10-10 Ingo MolnarMerge branches 'core/iommu', 'x86/amd-iommu' and 'x86...
2008-10-10 Ingo MolnarMerge branch 'linus' into x86/pat2
2008-10-10 Ingo MolnarMerge commit 'v2.6.27' into timers/hpet
2008-10-09 Russell KingMerge branch 'for-rmk' of git://git.marvell.com/orion
2008-10-09 Russell KingMerge branch 'for-rmk' of git://source.mvista.com/git...
2008-10-08 J. Bruce FieldsMerge branch 'from-tomtucker' into for-2.6.28
2008-10-08 Ingo MolnarMerge branches 'sched/devel', 'sched/cpu-hotplug',...
2008-10-06 Simon HormanMerge git://git./linux/kernel/git/davem/net-next-2...
2008-10-06 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-10-06 Ingo MolnarMerge branches 'x86/alternatives', 'x86/cleanups',...
2008-10-06 Ingo MolnarMerge branch 'x86/tracehook' into x86-v28-for-linus...
2008-10-06 Ingo MolnarMerge branch 'x86/prototypes' into x86-v28-for-linus...
2008-10-06 Ingo MolnarMerge branch 'x86/header-guards' into x86-v28-for-linus...
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into core/rcu
2008-10-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-02 Ingo MolnarMerge commit 'v2.6.27-rc8' into genirq
2008-10-01 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-09-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-30 Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-09-30 Ingo MolnarMerge commit 'v2.6.27-rc8' into oprofile
2008-09-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-29 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-09-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-26 Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/microcode
2008-09-24 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/pebs
2008-09-23 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-09-23 Ingo MolnarMerge branch 'timers/urgent' into x86/xen
2008-09-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-23 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-09-23 Ingo MolnarMerge branches 'sched/urgent' and 'sched/rt' into sched...
2008-09-23 Ingo MolnarMerge branch 'x86/signal' into core/signal
2008-09-22 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-09-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-22 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-09-22 Ingo MolnarMerge commit 'v2.6.27-rc7' into x86/debug
2008-09-22 James MorrisMerge branch 'master' into next
2008-09-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-19 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-09-19 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs/linux-2.6
2008-09-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-19 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-09-19 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-09-19 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-09-19 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-09-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-09-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-09-17 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-09-17 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-09-17 Stephen Hemmingerhpplus: fix build regression
2008-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
2008-08-21 Ingo MolnarMerge branch 'linus' into x86/doc
2008-08-18 Jesse BarnesMerge branch 'pci-for-jesse' of git://git./linux/kernel...
2008-08-14 Ingo MolnarMerge commit 'v2.6.27-rc3' into x86/prototypes
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 Dmitry TorokhovMerge commit 'v2.6.27-rc1' into for-linus
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 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-28 Ingo MolnarMerge branch 'x86/crashdump' into x86/urgent
2008-07-28 Ingo MolnarMerge branch 'linus' into x86/cpu
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'
2008-07-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-26 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-07-26 Ingo MolnarMerge branch 'linus' into x86/header-guards
2008-07-25 Linus TorvaldsMerge git://git.infradead.org/embedded-2.6
2008-07-25 David WoodhouseMerge branch 'linux-next' of git://git.infradead.org...
2008-07-25 Ingo MolnarMerge branch 'linus' into x86/x2apic
2008-07-25 Ingo MolnarMerge branch 'linus' into x86/pebs
2008-07-25 Benjamin HerrenschmidtMerge commit 'jk/jk-merge'
2008-07-25 Benjamin HerrenschmidtMerge commit 'gcl/gcl-next'
2008-07-24 Linus TorvaldsMerge branch 'release-2.6.27' of git://git./linux/kerne...
2008-07-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-24 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-07-24 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-07-24 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-07-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-07-24 Ingo MolnarMerge branch 'linus' into tracing/urgent
2008-07-24 Linus TorvaldsMerge branch 'sched/for-linus' of git://git./linux...
2008-07-24 Linus TorvaldsMerge branch 'cpus4096-for-linus' of git://git./linux...
2008-07-24 Linus TorvaldsMerge branch 'core/softlockup-for-linus' of git://git...
2008-07-24 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2008-07-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next