Mark Brown fa2c8f4017 Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict ...

resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c

2012-02-19 18:35:12 -08:00

..

acpi

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release

2012-01-23 19:47:06 -05:00

asm-generic

lib: add NO_GENERIC_PCI_IOPORT_MAP

2012-01-31 23:19:47 +02:00

crypto

…

drm

drm: Fix authentication kernel crash

2012-01-25 09:27:45 +00:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict

2012-02-19 18:35:12 -08:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

…

mtd

…

net

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

2012-02-10 15:08:57 -05:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

ASoC: dapm: Implement and instantiate DAI widgets

2012-02-17 08:10:10 -08:00

target

target: Change target_submit_cmd() to return void

2012-02-07 06:41:04 +00:00

trace

writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue

2012-02-06 11:17:25 +08:00

video

Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6

2012-02-07 15:54:02 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…