[XFS] Fix merge failures
[pandora-kernel.git] / arch / x86 / kernel / pvclock.c
2008-07-12 Russell KingMerge branches 'pxa-ian' and 'pxa-xm270' into pxa
2008-07-11 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-07-10 Russell KingMerge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm...
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-10 Ingo MolnarMerge branch 'linus' into core/printk
2008-07-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-09 Russell KingMerge branch 'machtypes' into pxa-palm
2008-07-08 Ingo MolnarMerge branch 'linus' into tmp.x86.mpparse.new
2008-07-08 Ingo MolnarMerge branches 'x86/mmio', 'x86/delay', 'x86/idle'...
2008-07-08 Ingo MolnarMerge branch 'x86/setup' into x86/devel
2008-07-08 Ingo MolnarMerge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm...
2008-07-08 Ingo MolnarMerge commit 'v2.6.26-rc9' into x86/cpu
2008-07-07 Russell KingMerge branch 'machtypes' into orion
2008-07-07 Russell KingMerge branches 'ns9x' and 'machtypes' into devel
2008-07-07 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-07-07 Ingo MolnarMerge branch 'linus' into tracing/mmiotrace
2008-07-06 Ingo MolnarMerge commit 'v2.6.26-rc9' into cpus4096
2008-07-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-07-05 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-07-04 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-07-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-03 J. Bruce FieldsMerge branch 'for-bfields' of git://linux-nfs.org/...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-07-03 Ingo MolnarMerge commit 'v2.6.26-rc8' into x86/mce
2008-07-03 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-07-03 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-03 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-07-03 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-07-03 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-07-03 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-06-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-06-30 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-06-30 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-06-30 Paul MackerrasMerge branch 'linux-2.6'
2008-06-29 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-06-29 Linus TorvaldsMerge branch 'audit.b52' of git://git./linux/kernel...
2008-06-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-06-26 Ingo MolnarMerge commit 'v2.6.26-rc8' into core/rcu
2008-06-25 Ingo MolnarMerge commit 'v2.6.26-rc8' into core/softlockup
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/timers
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/pebs
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/nmi
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/memtest
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/kconfig
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/irq
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/i8259
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/gart
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/fixmap
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/delay
2008-06-25 Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-06-25 Ingo MolnarMerge branch 'linus' into tracing/sysprof
2008-06-25 Ingo MolnarMerge branch 'linus' into tracing/mmiotrace-mergefixups
2008-06-25 Ingo MolnarMerge branch 'linus' into tracing/ftrace
2008-06-25 Ingo MolnarMerge branch 'linus' into sched/new-API-sched_setscheduler
2008-06-25 Ingo MolnarMerge branch 'linus' into sched/devel
2008-06-25 Ingo MolnarMerge branch 'linus' into core/softirq
2008-06-25 Ingo MolnarMerge commit 'v2.6.26-rc8' into x86/xen
2008-06-25 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-06-25 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-fixes
2008-06-25 Linus TorvaldsMerge branch 'kvm-updates-2.6.26' of git://git./linux...
2008-06-24 Gerd Hoffmannx86: Add structs and functions for paravirt clocksource