Arnd Bergmann 38abdcd0d0 Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2 ...

Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-15 21:05:52 +00:00

..

acpi

Merge 3.3-rc2 into the driver-core-next branch.

2012-02-02 11:24:44 -08:00

asm-generic

epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()

2012-02-24 11:42:50 -08:00

crypto

crypto: serpent-sse2 - add lrw support

2011-11-21 16:13:24 +08:00

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 branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2

2012-03-15 21:05:52 +00: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

[media] altera-stapl: it is time to move out from staging

2011-09-23 15:00:57 -03:00

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

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

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

[SCSI] libfc: Declare local functions static

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

sound

Merge branch 'fix/asoc' into for-linus

2012-01-31 15:13:14 +01: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

…