[XFS] Fix merge failures
[linux-2.6] / drivers / s390 / scsi /
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 git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-25  Christof Schmitt[S390] convert zfcp printks to pr_xxx macros.
2008-12-25  Kay Sievers[S390] struct device - replace bus_id with dev_name...
2008-12-25  Christof Schmitt[S390] zfcp: Report microcode level through service...
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-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-20  Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
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  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-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-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  Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
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-12-02  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-12-01  Swen Schillig[SCSI] zfcp: prevent double decrement on host_busy...
2008-12-01  Swen Schillig[SCSI] zfcp: fix deadlock between wq triggered port...
2008-12-01  Swen Schillig[SCSI] zfcp: eliminate race between validation and...
2008-12-01  Swen Schillig[SCSI] zfcp: verify for correct rport state before...
2008-12-01  Swen Schillig[SCSI] zfcp: returning an ERR_PTR where a NULL value...
2008-12-01  Christof Schmitt[SCSI] zfcp: Fix opening of wka ports
2008-12-01  Martin Petermann[SCSI] zfcp: fix remote port status check
2008-11-30  Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
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-28  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-11-26  Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25  Ingo MolnarMerge branches 'tracing/core', 'x86/urgent' and 'x86...
2008-11-25  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24  Ingo MolnarMerge branch 'sched/rt' into sched/core
2008-11-24  Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-24  Paul MackerrasMerge branch 'merge' of ssh:///linux/kernel/git/jwboyer...
2008-11-24  Paul MackerrasMerge branch 'merge' of git://git.secretlab.ca/git...
2008-11-23  Ingo MolnarMerge commit 'v2.6.28-rc6' into irq/urgent
2008-11-23  Ingo MolnarMerge branches 'tracing/profiling', 'tracing/options...
2008-11-23  Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/debug
2008-11-21  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-20  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-20  Ingo MolnarMerge branch 'x86/cleanups' into x86/irq
2008-11-20  Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-11-20  Ingo MolnarMerge branch 'linus' into x86/uv
2008-11-20  Linus TorvaldsMerge branch 'x86/numa' of git://git./linux/kernel...
2008-11-19  Ingo MolnarMerge branches 'tracing/ftrace' and 'tracing/urgent...
2008-11-19  Ingo MolnarMerge branch 'linus' into sched/core
2008-11-19  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-19  Paul MackerrasMerge branch 'linux-2.6' into next
2008-11-18  Ingo MolnarMerge branch 'linus' into tracing/urgent
next