From: Avi Kivity Date: Mon, 5 Jul 2010 07:46:52 +0000 (+0300) Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds... X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2b2e379b87dd3286a4b4a5d5d54174226d591663;p=users%2Fdwmw2%2Flinux.git Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (355 commits) Linux 2.6.35-rc4 module: initialize module dynamic debug later ARM: 6205/1: perf: ensure counter delta is treated as unsigned perf, x86: Fix incorrect branches event on AMD CPUs of/dma: fix build breakage in ppc4xx adma driver MAINTAINERS: Add an entry for i7core_edac i7core_edac: Avoid doing multiple probes for the same card i7core_edac: Properly discover the first QPI device amd64_edac: Fix syndrome calculation on K8 ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220 ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220 drm/i915: fix page flip finish vs. prepare on plane B correct console log level when ERST ACPI table is not found drm/i915: fix hibernation since i915 self-reclaim fixes drm/i915: change default panel fitting mode to preserve aspect ratio drm/i915: fix uninitialized variable warning in i915_setup_compression() drm/i915: take struct_mutex in i915_dma_cleanup() drm/i915: Fix CRT hotplug regression in 2.6.35-rc1 i915: fix ironlake edp panel setup (v4) drm/i915: don't access FW_BLC_SELF on 965G ... Signed-off-by: Avi Kivity --- 2b2e379b87dd3286a4b4a5d5d54174226d591663