[XFS] Fix merge failures
[pandora-kernel.git] / drivers / macintosh / via-pmu.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-21 Benjamin Herrenschmidtpowerpc/mm: Split mmu_context handling
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-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
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 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-27 Ingo MolnarMerge branch 'timers/urgent' of ssh:///linux/kernel...
2008-07-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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/pebs
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...
2008-07-23 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-07-21 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-07-21 Ingo MolnarMerge branches 'x86/urgent', 'x86/amd-iommu', 'x86...
2008-07-21 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into next
2008-07-21 Linus TorvaldsMerge branch 'for-2.6.27' of git://linux-nfs.org/~bfiel...
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-07-19 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-07-18 Ingo MolnarMerge branch 'linus' into x86/x2apic
2008-07-18 Ingo MolnarMerge branch 'linus' into pci-for-jesse
2008-07-18 Ingo MolnarMerge branch 'linus' into core/generic-dma-coherent
2008-07-18 Ingo MolnarMerge branch 'linus' into timers/nohz
2008-07-18 Ingo MolnarMerge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
2008-07-18 Ingo MolnarMerge branch 'linus' into x86/amd-iommu
2008-07-18 Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-07-18 David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-07-17 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-fixes-2.6
2008-07-17 Tony LuckPull pvops into release branch
2008-07-17 Linus TorvaldsMerge branch 'linux-next' of git://git./linux/kernel...
2008-07-16 Linus TorvaldsMerge branch 'for_linus' of git://git.infradead.org...
2008-07-16 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-07-15 Trond MyklebustMerge branch 'bkl-removal' into next
2008-07-15 Trond MyklebustMerge branch 'devel' into next
2008-07-15 Ingo MolnarMerge branch 'linus' into cpus4096
2008-07-15 Ingo MolnarMerge branch 'linus' into core/softlockup
2008-07-15 Ingo MolnarMerge branch 'generic-ipi' into generic-ipi-for-linus
2008-07-15 Linus TorvaldsMerge branch 'sbp2-spindown' of git://git./linux/kernel...
2008-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-15 Ben DooksMerge branch 'master' of git://git./linux/kernel/git...
2008-07-15 Ingo MolnarMerge branch 'core/rcu' into core/rcu-for-linus
2008-07-15 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-07-15 Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-07-15 Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-15 Linus TorvaldsMerge branch 'timers/for-linus' of git://git./linux...
2008-07-15 Linus TorvaldsMerge branch 'genirq' of git://git./linux/kernel/git...
2008-07-15 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-07-15 Linus TorvaldsMerge branch 'core/topology' of git://git./linux/kernel...
2008-07-15 Linus TorvaldsMerge branch 'core/stacktrace' of git://git./linux...
2008-07-15 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-07-15 Ingo MolnarMerge branch 'linus' into x86/urgent
2008-07-15 Benjamin HerrenschmidtMerge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c...
2008-07-14 Linus TorvaldsMerge branch 'for-2.6.27' of git://git.infradead.org...
2008-07-14 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-07-14 Linus TorvaldsMerge branch 'core/softirq' of git://git./linux/kernel...
2008-07-14 Linus TorvaldsMerge branch 'core/rodata' of git://git./linux/kernel...
2008-07-14 Linus TorvaldsMerge branch 'core/printk' of git://git./linux/kernel...
2008-07-14 Linus TorvaldsMerge branch 'core/locking' of git://git./linux/kernel...
2008-07-14 Linus TorvaldsMerge branch 'sched/new-API-sched_setscheduler' of...
2008-07-14 Linus TorvaldsMerge branch 'tracing/for-linus' of git://git./linux...
2008-07-14 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-07-14 Jonathan CorbetMerge commit 'v2.6.26' into bkl-removal
2008-07-02 Arnd Bergmannvia-pmu: BKL pushdown
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
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-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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-01 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-27 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-03-20 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-03-19 Trond MyklebustMerge branch 'hotfixes' into devel
2008-03-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-18 Len BrownMerge branches 'release' and 'dock' into release
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-16 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-03-15 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next