Mark Brown ddfb43f388 Merge tag 'v3.6-rc6' into for-3.7 ...

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c

2012-09-22 11:26:27 -04:00

..

acpi

Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base

2012-08-03 00:31:23 -04:00

asm-generic

mutex: Place lock in contended state after fastpath_lock failure

2012-08-13 18:46:54 +02:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

drm: Drop the NV12M and YUV420M formats

2012-09-13 12:38:10 +09:00

keys

KEYS: Permit in-place link replacement in keyring list

2012-05-11 10:56:56 +01:00

linux

Merge tag 'v3.6-rc6' into for-3.7

2012-09-22 11:26:27 -04:00

math-emu

…

media

[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl

2012-07-30 20:23:05 -03:00

memory

ddr: add LPDDR2 data from JESD209-2

2012-05-02 00:04:06 -07:00

misc

…

mtd

UBI: amend commentaries WRT dtype

2012-05-20 20:25:59 +03:00

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2012-09-07 14:38:50 -04:00

pcmcia

…

ras

RAS: Add a tracepoint for reporting memory controller events

2012-06-11 11:55:52 -03:00

rdma

Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus

2012-07-22 23:26:17 -07:00

rxrpc

…

scsi

Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

2012-07-25 15:58:48 -04:00

sound

ASoC: wm8960: remove 'dres' field from platform data structure

2012-09-21 08:35:06 -04:00

target

target: support zero allocation length in REQUEST SENSE

2012-09-07 11:14:21 -07:00

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-08-03 10:57:20 -07:00

video

video: da8xx-fb: configure FIFO threshold to reduce underflow errors

2012-07-29 01:11:09 +00:00

xen

Revert "xen PVonHVM: move shared_info to MMIO before kexec"

2012-08-16 13:05:25 -04:00

Kbuild

…