[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / sysdev / grackle.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-18 Paul MackerrasMerge branch 'linux-2.6' into next
2008-12-17 Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
2008-12-16 Josh Boyerpowerpc: Introduce ppc_pci_flags accessors
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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', '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-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-23 Paul MackerrasMerge branch 'linux-2.6'
2007-12-21 Paul MackerrasMerge branch 'linux-2.6'
2007-12-20 Benjamin Herrenschmidt[POWERPC] pci32: Add flags modifying the PCI code behaviour
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-08-31 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-08-25 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2007-08-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2007-08-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-08-01 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-31 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6.23
2007-07-30 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-07-29 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/cooloney...
2007-07-29 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-07-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-25 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-07-25 Linus TorvaldsMerge branch 'for_paulus' of /linux/kernel/git/galak...
2007-07-24 Kumar Gala[POWERPC] Make endianess of cfg_addr for indirect pci...
2007-04-30 Tony LuckPull percpu-dtc into release branch
2007-04-30 Tony LuckPull error-inject into release branch
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-20 Russell KingMerge ARM fixes
2007-02-19 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of ssh:///linux/kernel/git...
2007-02-17 John W. LinvilleMerge branch 'upstream' into upstream-jgarzik
2007-02-17 Len BrownPull sony into release branch
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2007-02-14 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-02-13 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2007-02-11 Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-10 James BottomleyMerge branch 'linus'
2007-02-10 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-02-09 Jeff GarzikMerge branch 'upstream' of /linux/kernel/git/linville...
2007-02-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-08 David S. MillerMerge branch 'HEAD' of /linux/kernel/git/herbert/crypto-2.6
2007-02-08 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-02-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2007-02-07 Paul MackerrasMerge branch 'linux-2.6'
2007-02-07 Pavel Roskin[POWERPC] Assign all PCI busses on G3 Blue & White
2005-12-06 Len BrownPull release into acpica branch
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11 Jeff GarzikMerge branch 'atmel'
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-06 Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 James BottomleyMerge by Hand
2005-11-05 Jeff GarzikMerge branch 'master'
2005-11-05 Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-10-31 Tony Luckmanual update from upstream:
2005-10-31 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-10-31 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-10-31 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-31 Paul MackerrasMerge ../linux-2.6 by hand
2005-10-28 Paul MackerrasMerge in v2.6.14 by hand
2005-10-26 Paul Mackerraspowerpc: Pull out MPC106 (grackle) initialization code...