[XFS] Fix merge failures
[pandora-kernel.git] / arch / sh / kernel / timers / timer-mtu2.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 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28 Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-12-22 Peter Griffinsh: Add support for SH7201 CPU subtype.
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-17 Tony LuckPull virt-cpu-accounting into release branch
2008-03-27 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-18 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-15 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-13 Len BrownMerge branches 'release', 'ejd', 'sony' and 'wmi' into...
2008-03-13 Len BrownMerge branches 'release', 'button-sysfs', 'misc', ...
2008-03-13 Len BrownMerge branches 'release', 'bugzilla-8570', 'bugzilla...
2008-03-13 Paul MackerrasMerge branch 'linux-2.6'
2008-03-13 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-03-12 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-12 Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-03-11 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-11 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-03-09 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-08 Trond MyklebustMerge commit 'origin' into devel
2008-03-07 Linus TorvaldsMerge branch 'slab-linus' of git://git./linux/kernel...
2008-03-07 Linus TorvaldsMerge branch 'hotfixes' of git://git.linux-nfs.org...
2008-03-07 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-03-06 Harvey Harrisonsh: replace remaining __FUNCTION__ occurrences
2008-02-29 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-02-29 Trond MyklebustMerge branch 'cleanups' into next
2008-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-26 Paul MackerrasMerge /pub/scm/linux/kernel/git/davem/lmb-2.6
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-21 Len BrownMerge branches 'release', 'bugzilla-9916', 'bugzilla...
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 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-02-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-15 Trond MyklebustMerge branch 'linus_origin' into hotfixes
2008-02-15 Christoph LameterMerge branch 'master' of git://git./linux/kernel/git...
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 'release' of git://git./linux/kernel/git...
2008-02-15 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
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 Paul Mundtsh: Shut up some trivial build warnings.
2008-02-14 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-02-13 Peter Zijlstraxtime_lock vs update_process_times
2007-07-22 Len BrownPull battery into release branch
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-13 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-05 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-06-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2007-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/aegl/linux-2.6
2007-05-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-05-09 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-08 Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
2007-05-08 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs/xfs-2.6
2007-05-08 Linus TorvaldsMerge branch 'reset-seq' of /linux/kernel/git/jgarzik...
2007-05-08 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-05-08 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2007-05-08 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-05-08 Linus TorvaldsMerge branch 'for-2.6.22' of git://git.kernel.dk/data...
2007-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-08 Bernhard WalleAdd IRQF_IRQPOLL flag on sh
2007-02-03 Len BrownPull video into test branch
next