Revision a754a87ce8b17024358c1be8ee0232ef09a7055f authored by Arnd Bergmann on 24 March 2012, 11:33:59 UTC, committed by Olof Johansson on 27 March 2012, 22:18:19 UTC
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some board-level changes that conflict with patches we already have here, so pull in that branch to resolve the conflicts. Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c arch/arm/mach-omap2/board-omap4panda.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended fix for mismerge as reported by Kevin Hilman] Signed-off-by: Olof Johansson <olof@lixom.net>
File | Mode | Size |
---|---|---|
Makefile | -rw-r--r-- | 394 bytes |
compat.c | -rw-r--r-- | 17.0 KB |
compat_mq.c | -rw-r--r-- | 4.1 KB |
ipc_sysctl.c | -rw-r--r-- | 6.0 KB |
ipcns_notifier.c | -rw-r--r-- | 2.2 KB |
mq_sysctl.c | -rw-r--r-- | 2.7 KB |
mqueue.c | -rw-r--r-- | 30.6 KB |
msg.c | -rw-r--r-- | 20.9 KB |
msgutil.c | -rw-r--r-- | 2.7 KB |
namespace.c | -rw-r--r-- | 4.3 KB |
sem.c | -rw-r--r-- | 42.1 KB |
shm.c | -rw-r--r-- | 29.2 KB |
syscall.c | -rw-r--r-- | 2.3 KB |
util.c | -rw-r--r-- | 22.8 KB |
util.h | -rw-r--r-- | 5.3 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...