[XFS] Fix merge failures
[linux-2.6] / arch / parisc / kernel / signal.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  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-28  Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28  Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28  Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-25  James MorrisMerge branch 'next' into for-linus
2008-12-04  James MorrisMerge branch 'master' into next
2008-11-18  James MorrisMerge branch 'master' into next
2008-11-14  James MorrisMerge branch 'master' into next
2008-11-13  David HowellsCRED: Wrap task credential accesses in the PA-RISC...
2008-07-10  Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-05-07  Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-03  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01  Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30  Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30  Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29  Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-27  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24  Trond MyklebustMerge branch 'devel'
2008-04-24  Paul MackerrasMerge branch 'powerpc-next' of /linux/kernel/git/galak...
2008-04-22  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-21  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-19  Russell KingMerge branch 'merge-fixes' into devel
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-17  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-17  Tony LuckPull miscellaneous into release branch
2008-04-17  Tony LuckPull nptcg into release branch
2008-04-17  Tony LuckPull kvm-patches into release branch
2008-04-17  Tony LuckPull percpureserve into release branch
2008-04-17  Tony LuckPull regset into release branch
2008-04-17  Tony LuckPull virt-cpu-accounting into release branch
2008-04-17  Tony LuckPull fsys_gettimeofday into release branch
2008-04-16  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-04-16  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-15  Kyle McMartin[PARISC] fix signal trampoline cache flushing
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07  Len BrownMerge branches 'release' and 'throttling-domains' into...
2008-02-07  Len BrownMerge branches 'release' and 'menlo' into release
2008-02-07  Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07  Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07  Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07  Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07  Len BrownMerge branches 'release' and 'dmi' into release
2008-02-07  Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07  Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07  Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07  Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07  Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-07  Josh BoyerMerge branch 'virtex-for-2.6.25' of git://git.secretlab...
2008-02-07  Paul MackerrasMerge branch 'for-2.6.25' of git://git.secretlab.ca...
2008-02-06  Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-04  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-02-04  Linus TorvaldsMerge branch 'slub-linus' of git://git./linux/kernel...
2008-02-04  Linus TorvaldsMerge git://git./linux/kernel/git/x86/linux-2.6-x86
2008-02-04  Linus TorvaldsMerge git://git./linux/kernel/git/rusty/linux-2.6-for...
2008-02-04  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2008-02-03  Paulius ZaleckasSpelling fixes: lenght->length
2007-12-10  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-11-20  Len BrownPull cpuidle into release branch
2007-11-17  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-10-29  Len BrownPull cpuidle into release branch
2007-10-24  Jeff GarzikMerge branch 'upstream-jeff' of git://git./linux/kernel...
2007-10-23  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23  Paul MackerrasMerge branch 'for-2.6.24' of /linux/kernel/git/jwboyer...
2007-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-23  Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-10-21  Linus TorvaldsMerge branch 'master' of hera./linux/kernel/git/kyle...
2007-10-20  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-20  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-10-19  Linus TorvaldsMerge ssh:///linux/kernel/git/tglx/linux-2.6-x86
2007-10-19  Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-19  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2007-10-19  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-10-19  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-19  Linus TorvaldsMerge ssh:///linux/kernel/git/tglx/linux-2.6-x86
2007-10-19  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-19  Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2007-10-19  Pavel Emelyanovpid namespaces: changes to show virtual ids to user
2007-07-22  Len BrownPull battery into release branch
next