[XFS] Fix merge failures
[pandora-kernel.git] / drivers / macintosh / via-pmu68k.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 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Finn Thainm68k: machw.h cleanup
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-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 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-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 '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...
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 cpus4096
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./linux/kernel...
2008-07-16 Linus TorvaldsMerge branch 'for_linus' of git://git.infradead.org...
2008-07-16 Linus TorvaldsMerge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2008-07-16 Ingo MolnarMerge branch 'linus' into x86/kprobes
2008-07-16 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-07-16 Benjamin HerrenschmidtMerge commit 'origin/master'
2008-07-15 Benjamin HerrenschmidtMerge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c...
2008-07-14 Benjamin HerrenschmidtMerge commit 'origin/HEAD' into test-merge
2008-07-01 Adrian Bunkdrivers/macintosh: Various cleanups
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-09-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-11 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-11 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-09-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-31 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-31 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-08-28 Paul MackerrasMerge branch 'linux-2.6' into for-2.6.24
2007-08-27 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-08-25 Linus TorvaldsMerge branch 'agp-patches' of git://git./linux/kernel...
2007-08-25 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2007-08-25 Len BrownPull thermal into release branch
2007-08-25 Len BrownPull bugzilla-1641 into release branch
2007-08-25 Len BrownPull battery into release branch
2007-08-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6.23
2007-08-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-08-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/usb-2.6
2007-08-24 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-08-23 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-23 Johannes Bergremove dead code in via-pmu68k
2007-07-22 Len BrownPull battery into release branch
2007-06-05 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-05-11 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-10 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-05-10 Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-10 Len BrownPull thermal into release branch
2007-05-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-05-09 Russell KingMerge branches 'armv7', 'at91', 'misc' and 'omap' into...
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-05-08 Linus TorvaldsMerge branch 'reset-seq' of /linux/kernel/git/jgarzik...
2007-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-08 Dmitry TorokhovMerge git://git./linux/kernel/git/torvalds/linux-2.6
2007-05-08 Paul MackerrasMerge branch 'linux-2.6'
2007-05-07 Linus TorvaldsMerge git://git./linux/kernel/git/aegl/linux-2.6
2007-05-07 Linus TorvaldsMerge branch 'server-cluster-locking-api' of git:/...
2007-05-07 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
next