diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-05 19:55:07 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-05 19:55:07 +0200 |
commit | 11e688862c4c8162119a4ca51c3326555966c8bb (patch) | |
tree | 8bfdf90255955696d8b687890b10daaf7852617a /arch/mips/bcm63xx/dev-flash.c | |
parent | Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', '... (diff) | |
parent | ASoC: wm8994: Pass the IRQF_ONESHOT flag (diff) | |
parent | ASoC: wm8996: Pass the IRQF_ONESHOT flag (diff) | |
parent | ASoC: zx: fix platform_no_drv_owner.cocci warnings (diff) | |
download | linux-11e688862c4c8162119a4ca51c3326555966c8bb.tar.xz linux-11e688862c4c8162119a4ca51c3326555966c8bb.zip |
Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and 'asoc/topic/zx' into asoc-next