Changes in r200

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

f43dc23d5ea91fca257be02138a255f02d98e806 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Thu, 13 Jan 2011 06:06:28 +0000

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-reworkConflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

d9c5841e22231e4e49fd0a1004164e6fce59b7a6 - Merge branch 'x86/asm' into x86/atomic

Thu, 29 Apr 2010 23:53:17 +0000

Merge branch 'x86/asm' into x86/atomicMerge reason: Conflict between LOCK_PREFIX_HERE and relative alternatives pointersResolved Conflicts: arch/x86/include/asm/alternative.h arch/x86/kernel/alternative.cSigned-off-by: H. Peter Anvin List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

87d8a69709d971913e6cc7210450fcb8be963667 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Fri, 09 Apr 2010 14:17:41 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

ec28dcc6b4c00b78ad269ad5b85ebd5c2d504825 - Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release

Mon, 15 Mar 2010 01:30:17 +0000

Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

fad837c16cdd856c68ce2e1335ad0fe836ed8ecd - Merge commit 'v2.6.34-rc1' into for-2.6.35

Wed, 10 Mar 2010 15:02:37 +0000

Merge commit 'v2.6.34-rc1' into for-2.6.35 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

ce67eef6a112bb283c6db39f9195800f31f5599a - Merge commit 'v2.6.34-rc1' into for-linus

Tue, 09 Mar 2010 07:17:32 +0000

Merge commit 'v2.6.34-rc1' into for-linus List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

f790c0ca6fad60b544bb73eda8cc841a6436725b - Merge branch 'master' of /repos/git/linux-2.6

Mon, 08 Mar 2010 11:55:23 +0000

Merge branch 'master' of /repos/git/linux-2.6Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.cSigned-off-by: Patrick McHardy List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

4ea41e2de5bba756858bb40f964e3490b6d1a25c - Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Thu, 04 Mar 2010 17:03:16 +0000

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incomingResolve merge conflict in fs/xfs/linux-2.6/xfs_export.c. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

398007f863a4af2b4a5a07219c5a617f1a098115 - Merge branch 'linux-2.6.33'

Fri, 26 Feb 2010 20:34:02 +0000

Merge branch 'linux-2.6.33' List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

a7790532f5b7358c33a6b1834dc2b318de209f31 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Fri, 26 Feb 2010 19:04:15 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6The SmartMedia FTL code depends on new kfifo bits from 2.6.33 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

64b9fb5704a479d98a59f2a1d45d3331a8f847f8 - Merge commit 'v2.6.33' into tracing/core

Fri, 26 Feb 2010 08:18:32 +0000

Merge commit 'v2.6.33' into tracing/coreConflicts: scripts/recordmcount.plMerge reason: Merge up to v2.6.33.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

03806fa20f6a081493a731a4b18ea66317f9f947 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Thu, 25 Feb 2010 13:35:22 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

996de8c6fe95c5a9fc524241cc8f142ef0605d3d - Merge commit 'v2.6.33' into core/rcu

Thu, 25 Feb 2010 08:40:22 +0000

Merge commit 'v2.6.33' into core/rcuMerge reason: Update from -rc4 to -final.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

109d28152b6e9d5de64cd23e3bc08885ccb3d1ef - Merge tag 'v2.6.33' for its firewire changes since last branch point

Wed, 24 Feb 2010 19:31:04 +0000

Merge tag 'v2.6.33' for its firewire changes since last branch pointSigned-off-by: Stefan Richter List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

d02e30c31c57683a66ed68a1bcff900ca78f6d56 - Merge branch 'x86/irq' into x86/apic

Tue, 23 Feb 2010 00:20:34 +0000

Merge branch 'x86/irq' into x86/apicMerge reason: Conflicts in arch/x86/kernel/apic/io_apic.cResolved Conflicts: arch/x86/kernel/apic/io_apic.cSigned-off-by: H. Peter Anvin List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

f11cbd74c5ff3614f6390b4de67a6ffdc614c378 - Merge branch 'master' into for-2.6.34

Mon, 22 Feb 2010 12:48:51 +0000

Merge branch 'master' into for-2.6.34 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

8c2fcadc933f713d51f46ec4dcd9b12830e0df84 - Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Thu, 18 Feb 2010 00:20:14 +0000

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

b7e56edba4b02f2079042c326a8cd72a44635817 - Merge branch 'linus' into x86/mm

Wed, 17 Feb 2010 17:27:37 +0000

Merge branch 'linus' into x86/mmx86/mm is on 32-rc4 and missing the spinlock namespace changes whichare needed for further commits into this topic.Signed-off-by: Thomas Gleixner List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200

7fb3a069bc5d3577409c2ae89f89cd264ff85816 - Merge branch 'fix/misc' into topic/misc

Wed, 17 Feb 2010 13:24:46 +0000

Merge branch 'fix/misc' into topic/miscConflicts: sound/pci/hda/patch_realtek.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/r200