diff options
author | Mark Brown <broonie@kernel.org> | 2015-05-12 20:31:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-05-12 20:31:33 +0100 |
commit | 7730c0b55043f6ff1c27e9cb45e13679995b2361 (patch) | |
tree | b7f61c799ee4fed743c36e92a4d7cdffa259b7c7 /arch/arm/mach-omap2/omap24xx.h | |
parent | c2f642373aa974064a5bd2e71aa1908c83a6bea6 (diff) | |
parent | 27796e755a2fc6707cdf9b484a56395f703e4f3d (diff) | |
parent | 545774bd6e1427d98dde77244329d2311c5eca6f (diff) | |
parent | 810e4425c224af6be67dff68c8832af1b5a11f89 (diff) | |
parent | 85e36a1f4a735d991ba5106781ea48e89a0b8901 (diff) | |
parent | 17fc2e0a3db11889e942c5ab15a1fcb876638f25 (diff) | |
download | linux-7730c0b55043f6ff1c27e9cb45e13679995b2361.tar.bz2 |
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/mc13783', 'asoc/fix/uda1380', 'asoc/fix/wm8960' and 'asoc/fix/wm8994' into asoc-linus