]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a387419 b01543d)
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)
commitfa2c8f401797eee814b7b9fa0b23fa6c4c3f5533
tree826fb23071b866e112d6e9c510fe3ad4d668acdctree | snapshot
parenta387419612f9c246701a5080bccecf3c04f65277commit | diff
parentb01543dfe67bb1d191998e90d20534dc354de059commit | 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
Unnamed repository; edit this file 'description' to name the repository.