[XFS] Fix merge failures
[pandora-kernel.git] / drivers / macintosh / via-macii.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-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-09 David S. MillerMerge branch 'pending' of /linux/kernel/git/vxy/lksctp-dev
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
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 'wmi-2.6.25' into release
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 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-06 David S. MillerMerge branch 'upstream-davem' of /linux/kernel/git...
2008-02-06 Paul MackerrasMerge branch 'for-2.6.25' of /linux/kernel/git/galak...
2008-02-06 David S. MillerMerge branch 'fixes' of /linux/kernel/git/linville...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-05 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-05 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-02-05 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-05 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-05 Linus TorvaldsMerge branch 'agp-patches' of git://git./linux/kernel...
2008-02-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-05 Finn Thainmac68k: macii adb comment correction
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
2007-05-07 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-07 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-05-07 David S. MillerMerge git://git./linux/kernel/git/holtmann/bluetooth-2.6
2007-05-06 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-05-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-06 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-05 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-05-05 Linus TorvaldsMerge branch 'for-linus' of git://one.firstfloor.org...
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/voyager-2.6
2007-05-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-05 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-05-05 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2007-05-05 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/dtor...
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-05-05 Finn Thainm68k: Mac II ADB fixes
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/davej/cpufreq
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-20 Russell KingMerge ARM fixes
2007-02-19 Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
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 Jeff GarzikMerge branch 'master' into upstream
2007-02-17 Len BrownPull bugzilla-7897 into release branch
2007-02-17 Len BrownPull bugzilla-7887 into release branch
2007-02-17 Len BrownPull bugzilla-7200 into release branch
2007-02-17 Len BrownPull remove-hotkey into release branch
2007-02-17 Len BrownPull sony into release branch
2007-02-17 Len BrownPull fluff into release branch
2007-02-16 Len BrownPull misc-for-upstream into release branch
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-02-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-02-14 Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
next