[XFS] Fix merge failures
[pandora-kernel.git] / arch / x86 / kernel / i8253.c
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-06 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-05-01 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branch 'orion-fixes2'
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-28 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-27 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-26 Linus TorvaldsMerge git://git./linux/kernel/git/mchehab/v4l-dvb
2008-04-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-26 Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-04-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-26 Akinobu Mitax86: cleanup div_sc() usage
2008-04-26 Akinobu Mitax86: cleanup clocksource_hz2mult usage
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-29 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-24 David S. MillerMerge branch 'master' of ../linux-2.6/
2008-02-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-19 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-15 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-14 Christoph LameterMerge branch 'master' of git://git./linux/kernel/git...
2008-02-14 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-02-13 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2008-02-13 Linus TorvaldsMerge git://git./linux/kernel/git/x86/linux-2.6-x86
2008-02-13 Harvey Harrisonx86: pit_clockevent can be static
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-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/rusty/linux-2.6-for...
2008-01-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/x86/linux-2.6-x86
2008-01-30 Alan Coxx86: isolate PIC/PIT in/out calls
2008-01-30 Ralf Baechlemips, x86: optimize the i8259 code a bit
2008-01-30 Thomas Gleixnerx86: unregister PIT clocksource when PIT is disabled
2008-01-30 Thomas Gleixnerclocksource: add unregister function to disable unusabl...
2008-01-30 Thomas Gleixnerx86: restrict PIT clocksource usage
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 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2007-10-19 Simon Arlottspelling fixes: arch/i386/
2007-10-19 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-17 Linus TorvaldsMerge branch 'xen-upstream' of git://git./linux/kernel...
2007-10-17 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-10-16 Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2007-10-16 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2007-10-15 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2007-10-15 Linus TorvaldsMerge branch 'locks' of git://linux-nfs.org/~bfields...
2007-10-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-10-15 Linus TorvaldsMerge git://git.linux-nfs.org/pub/linux/nfs-2.6
2007-10-15 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
next