Daniel Vetter 398b7a1b88 Linux 3.6-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk= =0v2l -----END PGP SIGNATURE----- Merge tag 'v3.6-rc7' into drm-intel-next-queued Manual backmerge of -rc7 to resolve a silent conflict leading to compile failure in drivers/gpu/drm/i915/intel_hdmi.c. This is due to the bugfix in -rc7: commit b98b601672 Author: Wang Xingchao <xingchao.wang@intel.com> Date: Thu Sep 13 07:43:22 2012 +0800 drm/i915: HDMI - Clear Audio Enable bit for Hot Plug Since this code moved around a lot in -next git put that snippet at the wrong spot. I've tried to fix this by making the conflict explicit by merging a version for next with: commit 3cce574f01 Author: Wang Xingchao <xingchao.wang@intel.com> Date: Thu Sep 13 11:19:00 2012 +0800 drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally But that failed to solve the entire problem. To avoid pushing out further -nightly branch to our QA where this is broken, do the backmerge and manually add the stuff git adds to -next from the patch in -fixes. Note that this doesn't show up in git's merge diff (and hence is also not handled by git rerere), which adds to the reasons why I'd like to fix this with a verbose backmerge. The git merge diff only shows a bunch of trivial conflicts of the "code changed in lines next to each another" kind. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-09-24 18:17:12 +02:00
..
ABI	PCI/PM: Add ABI document for sysfs file d3cold_allowed	2012-08-21 17:36:33 -06:00
DocBook	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next	2012-08-27 16:22:20 +10:00
EDID	…
PCI	…
RCU	rcu: Update documentation to cover call_srcu() and srcu_barrier().	2012-07-02 12:34:03 -07:00
accounting	…
acpi	…
aoe	…
arm	[media] Documentation: Add newline at end-of-file to files lacking one	2012-07-30 20:37:01 -03:00
auxdisplay	…
backlight	…
blackfin	…
block	Documentation: update tunable options in block/cfq-iosched.txt	2012-08-09 15:28:05 +02:00
blockdev	…
cdrom	…
cgroups	mm/memcg: complete documentation for tcp memcg files	2012-07-31 18:42:43 -07:00
connector	connector: Move cn_test.c away from NLMSG_PUT().	2012-06-26 21:19:02 -07:00
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	…
device-mapper	Merge branch 'for-next' of git://neil.brown.name/md	2012-08-01 09:02:01 -07:00
devicetree	arm-soc fixes for v3.6-rc3	2012-08-25 17:33:33 -07:00
driver-model	…
dvb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-30 19:03:41 -07:00
early-userspace	…
extcon	…
fault-injection	fault-injection: add tool to run command with failslab or fail_page_alloc	2012-07-30 17:25:22 -07:00
fb	…
filesystems	Documentation: update mount option in filesystem/vfat.txt	2012-08-21 16:45:02 -07:00
firmware_class	…
frv	…
hid	…
hwmon	hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver	2012-07-21 21:48:44 -07:00
i2c	i2c-i801: Add Device IDs for Intel Lynx Point-LP PCH	2012-09-10 10:14:02 +02:00
i2o	…
ia64	…
ide	…
infiniband	…
input	Input: add driver for FT5x06 based EDT displays	2012-07-24 23:55:03 -07:00
ioctl	vfio: VFIO core	2012-07-31 08:16:22 -06:00
isdn	…
ja_JP	…
kbuild	…
kdump	kexec: update URL of kexec homepage	2012-07-18 18:35:57 -07:00
ko_KR	…
laptops	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
leds	LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS	2012-07-24 16:00:51 +08:00
m68k	…
make	…
memory-devices	…
mips	…
misc-devices	…
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	netconsole.txt: revision of examples for the receiver of kernel messages	2012-08-14 14:33:33 -07:00
nfc	NFC: Error management documentation	2012-07-09 16:42:11 -04:00
parisc	…
pcmcia	…
power	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
powerpc	…
pps	…
prctl	security: Minor improvements to no_new_privs documentation	2012-07-08 00:25:48 +10:00
pti	…
ptp	…
rapidio	…
s390	…
scheduler	…
scsi	…
security	Yama: higher restrictions should block PTRACE_TRACEME	2012-08-10 19:58:07 +10:00
serial	…
sh	…
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
spi	…
sysctl	Documentation: fix the VM knobs descritpion WRT pdflush	2012-08-04 12:15:09 +04:00
target	…
telephony	…
thermal	Thermal: Documentation update	2012-07-24 23:20:40 -04:00
timers	…
trace	…
usb	…
vDSO	…
video4linux	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
virtual	KVM updates for the 3.6 merge window	2012-07-24 12:01:20 -07:00
vm	hugetlb: update hugetlbpage.txt	2012-08-21 16:45:03 -07:00
w1	1-Wire: Add support for the maxim ds1825 temperature sensor	2012-08-16 12:33:59 -07:00
watchdog	watchdog: fix watchdog-test.c build warning	2012-08-29 17:12:58 +02:00
wimax	…
x86	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-26 13:13:25 -07:00
zh_CN	…
.gitignore	…
00-INDEX	…
BUG-HUNTING	…
Changes	…
CodingStyle	…
DMA-API-HOWTO.txt	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute	2012-07-30 12:25:47 +02:00
HOWTO	…
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	irq_domain: Standardise legacy/linear domain selection	2012-07-11 14:59:17 +01:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	Documentation: ManagementStyle: fixed typo	2012-06-28 12:03:15 +02:00
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
clk.txt	…
coccinelle.txt	…
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	…
dmaengine.txt	…
dontdiff	kconfig: remove lkc_defs.h from .gitignore and dontdiff	2012-07-13 15:08:25 +02:00
dynamic-debug-howto.txt	…
edac.txt	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	ARM: at91/feature-removal-schedule: delay at91_mci removal	2012-08-27 09:59:36 +02:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-07-30 10:11:31 -07:00
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	…
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
lockup-watchdogs.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
md.txt	…
media-framework.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	…
mutex-design.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
pi-futex.txt	…
pinctrl.txt	Documentation/pinctrl.txt: Fix some misspelled macros	2012-08-17 11:09:58 +02:00
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	vsprintf: add support of '%*ph[CDN]'	2012-07-30 17:25:14 -07:00
prio_tree.txt	…
pwm.txt	…
ramoops.txt	pstore/ram: Add ftrace messages handling	2012-07-17 10:14:17 -07:00
rbtree.txt	…
remoteproc.txt	remoteproc: adopt the driver core's alloc/add/del/put naming	2012-07-06 00:53:27 +03:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable: Allow merging of backports for serious user-visible performance issues	2012-06-25 12:11:58 -07:00
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vfio.txt	vfio: Add documentation	2012-07-31 08:16:23 -06:00
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	workqueue: reimplement WQ_HIGHPRI using a separate worker_pool	2012-07-13 22:24:45 -07:00
xz.txt	…
zorro.txt	…