]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7e3a30 321a767)
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Feb 2012 02:35:12 +0000 (18:35 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Feb 2012 02:35:12 +0000 (18:35 -0800)
commit06e259c034a58754ea49fdb3307f43706985ee6e
tree826fb23071b866e112d6e9c510fe3ad4d668acdctree | snapshot
parentc7e3a3008a4992f14d6c5cb9c0da757b2a1e5e14commit | diff
parent321a767d01de16896a7e28edab521f81c20e6c60commit | diff
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
drivers/base/regmap/regcache.c diff1 | diff2 | blob | history
sound/soc/sh/fsi.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.