Changes in rs600

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/rs600

b73077eb03f510a84b102fb97640e595a958403c - Merge branch 'next' into for-linus

Tue, 24 May 2011 07:06:26 +0000

Merge branch 'next' into for-linus List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

020abf03cd659388f94cb328e1e1df0656e0d7ff - Merge tag 'v2.6.39-rc7'

Tue, 10 May 2011 18:52:07 +0000

Merge tag 'v2.6.39-rc7'in order to pull in changes in drivers/media/dvb/firewire/ andsound/firewire/. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

03351ff4d897098a590cb247b6eebc470b8ecb5a - Merge commit 'v2.6.39-rc4' into next

Sat, 23 Apr 2011 06:35:25 +0000

Merge commit 'v2.6.39-rc4' into next List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 - Merge branch 'for-2.6.39' into for-2.6.40

Sun, 03 Apr 2011 10:29:43 +0000

Merge branch 'for-2.6.39' into for-2.6.40 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

7bf7e370d5919112c223a269462cd0b546903829 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1

Fri, 25 Mar 2011 15:41:20 +0000

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ...NOTE!This merge commit was created to fix compilation error. The blocktree was merged upstream and removed the 'elv_queue_empty()'function which the new 'mtdswap' driver is using. So a simplemerge of the mtd tree with upstream does not compile. And themtd tree has already be published, so re-basing it is not an option.To fix this unfortunate situation, I had to merge upstream into themtd-2.6.git tree without committing, put the fixup patch on top ofthis, and then commit this. The result is that we do not have commitswhich do not compile.In other words, this merge commit "merges" 3 things: the MTD tree, theupstream tree, and the fixup patch. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

9c9585e0e96f8340d704256db00b2ec28240c36e - Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers

Thu, 17 Mar 2011 11:04:51 +0000

Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

1d2a1959fe534279cf37aba20b08c24c20840e52 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

Thu, 17 Mar 2011 07:44:08 +0000

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

92c260f755c42337c550d8ac1f8ccd1b32bffb20 - Merge remote branch 'rmk/for-linus' into for-linus

Thu, 17 Mar 2011 05:13:16 +0000

Merge remote branch 'rmk/for-linus' into for-linus* rmk/for-linus: (1557 commits) ARM: 6806/1: irq: introduce entry and exit functions for chained handlers ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas ARM: 6747/1: P2V: Thumb2 support ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9 ARM: 6772/1: errata: possible fault MMU translations following an ASID switch ARM: 6776/1: mach-ux500: activate fix for errata 753970 ARM: 6794/1: SPEAr: Append UL to device address macros. ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files. ARM: 6681/1: SPEAr: add debugfs support to clk API ARM: 6703/1: SPEAr: update clk API support ARM: 6679/1: SPEAr: make clk API functions more generic ARM: 6737/1: SPEAr: formalized timer support ...Conflicts: arch/arm/mach-msm/board-msm7x27.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-qsd8x50.c arch/arm/mach-msm/board-sapphire.c arch/arm/mach-msm/include/mach/memory.h List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2 - Merge commit 'v2.6.38' into x86/mm

Tue, 15 Mar 2011 07:29:44 +0000

Merge commit 'v2.6.38' into x86/mmConflicts: arch/x86/mm/numa_64.cMerge reason: Resolve the conflict, update the branch to .38.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

34db18abd376b2075c760c38f0b861aed379415d - Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next

Mon, 14 Mar 2011 04:15:13 +0000

Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next* 'intel/drm-intel-next' of ../drm-next: (755 commits) drm/i915: Only wait on a pending flip if we intend to write to the buffer drm/i915/dp: Sanity check eDP existence drm/i915: Rebind the buffer if its alignment constraints changes with tiling drm/i915: Disable GPU semaphores by default drm/i915: Do not overflow the MMADDR write FIFO Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing" drm/i915: Don't save/restore hardware status page address register drm/i915: don't store the reg value for HWS_PGA drm/i915: fix memory corruption with GM965 and >4GB RAM Linux 2.6.38-rc7 Revert "TPM: Long default timeout fix" drm/i915: Re-enable GPU semaphores for SandyBridge mobile drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#" Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU" drm/i915: Allow relocation deltas outside of target bo drm/i915: Silence an innocuous compiler warning for an unused variable fs/block_dev.c: fix new kernel-doc warning ACPI: Fix build for CONFIG_NET unset mm: must include x86: Use u32 instead of long to set reset vector back to 0 ...Conflicts: drivers/gpu/drm/i915/i915_gem.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

9c3c8afccb6a163fd2be739f511e863eab668702 - Merge commit 'v2.6.38-rc8' into spi/next

Sat, 12 Mar 2011 08:25:53 +0000

Merge commit 'v2.6.38-rc8' into spi/nextConflicts: drivers/spi/pxa2xx_spi_pci.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

c9149556756d56c68451a4a8735c37e7062fd3d7 - Merge branch 'slab/rcu' into slab/next

Fri, 11 Mar 2011 16:10:45 +0000

Merge branch 'slab/rcu' into slab/nextConflicts: mm/slub.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

2d8ad8719591fa803b0d589ed057fa46f49b7155 - Merge commit 'v2.6.38-rc1' into kbuild/packaging

Wed, 09 Mar 2011 15:15:44 +0000

Merge commit 'v2.6.38-rc1' into kbuild/packaging List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

c8b44163b754612fc4769fe1c5df00e98fc9d3c6 - Merge commit 'v2.6.38-rc8' into x86/asm

Wed, 09 Mar 2011 09:38:55 +0000

Merge commit 'v2.6.38-rc8' into x86/asmMerge reason: Update with the latest fixes.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

1cc26bada9f6807814806db2f0d78792eecdac71 - Merge branch 'master'; commit 'v2.6.38-rc7' into next

Mon, 07 Mar 2011 23:55:06 +0000

Merge branch 'master'; commit 'v2.6.38-rc7' into next List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

c871fe663a6368fd0e98f5a3bfd81b0b9c591266 - Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c

Thu, 03 Mar 2011 22:17:49 +0000

Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

6fae9c25134baffbeeb20031479e7ff6f6d8eec0 - Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Tue, 01 Mar 2011 20:04:39 +0000

Merge commit 'v2.6.38-rc6' into for-2.6.39/coreConflicts: block/cfq-iosched.cSigned-off-by: Jens Axboe List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

38a5d6736e7f714cc56d58692001e66dcbb98799 - Merge commit 'v2.6.38-rc6' into devicetree/next

Mon, 28 Feb 2011 08:36:21 +0000

Merge commit 'v2.6.38-rc6' into devicetree/nextConflicts: drivers/spi/pxa2xx_spi_pci.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600

02fa9f0451ac639a687bfc145eefe58703ff220e - Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes

Fri, 25 Feb 2011 20:27:14 +0000

Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/rs600