[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / ioc3.h
2006-12-12 Dave JonesMerge ../linus
2006-11-30 Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
2006-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2006-10-22 David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-21 Jeff GarzikMerge tag 'jg-20061012-00' of git://electric-eye.fr...
2006-10-21 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-11 Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-08 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-06 Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-05 Linus TorvaldsMerge git://git.infradead.org/~dhowells/irq-2.6
2006-10-05 David HowellsIRQ: Maintain regs pointer globally rather than passing...
2006-03-21 Linus TorvaldsMerge branch 'origin'
2006-03-21 Tony LuckPull icc-cleanup into release branch
2006-03-21 Tony LuckPull sn2-mmio-writes into release branch
2006-03-21 Tony LuckPull altix-ce1.0-asic into release branch
2006-03-21 Tony LuckPull sn-handle-sc-powerdown into release branch
2006-03-21 Tony LuckPull delete-sigdelayed into release branch
2006-03-21 Tony LuckPull sem2mutex-ioc4 into release branch
2006-03-21 Tony LuckPull ia64-mutex-primitives into release branch
2006-03-21 Tony LuckPull bsp-removal into release branch
2006-03-20 Adrian BunkMerge ... git://git./linux/kernel/git/torvalds/linux...
2006-03-14 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-03-02 Jeff GarzikMerge branch 'lro'
2006-02-24 Anton AltaparmakovMerge ../ntfs-2.6-devel
2006-02-24 Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2006-02-23 Steven WhitehouseMerge branch 'master'
2006-02-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-02-16 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-02-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-02-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-02-10 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-02-10 Paul MackerrasMerge ../powerpc-merge
2006-02-09 Tony LuckPull new-syscalls into release branch
2006-02-09 Jeff GarzikMerge branch 'viro'
2006-02-09 Jeff GarzikMerge branch 'net.b0' of git://git./linux/kernel/git...
2006-02-09 Jeff GarzikMerge branch 'upstream-fixes'
2006-02-09 Jeff GarzikMerge branch 'upstream'
2006-02-09 Jeff GarzikMerge branch 'upstream-fixes'
2006-02-09 Jeff GarzikMerge branch 'master'
2006-02-09 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-02-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-02-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-02-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-02-08 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2006-02-08 Linus TorvaldsMerge branch 'for-linus2' of git://git./linux/kernel...
2006-02-08 Al Viro[PATCH] sn3 iomem annotations and fixes
2006-02-02 Linus TorvaldsMerge branch 'drm-linus' of git://git./linux/kernel...
2006-02-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/x86
2006-01-27 Len BrownPull release into acpica branch
2006-01-24 Len Brown[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica...
2006-01-24 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-19 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-01-18 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-01-17 Jeff GarzikMerge branch 'upstream'
2006-01-17 Jeff GarzikMerge branch 'upstream'
2006-01-16 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-01-16 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-01-15 Mauro Carvalho ChehabMerge branch 'work'
2006-01-15 Mauro Carvalho ChehabMerge branch 'work'
2006-01-15 Mauro Carvalho ChehabMerge ssh:///linux/kernel/git/torvalds/linux-2.6
2006-01-15 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-01-15 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-01-15 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-01-15 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-01-15 Patrick Gefre[PATCH] Altix: ioc3 serial support