Merge tag 'v3.10.55' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Thu, 18 Sep 2014 17:49:28 +0000 (10:49 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 18 Sep 2014 17:49:28 +0000 (10:49 -0700)
This is the 3.10.55 stable release

1  2 
drivers/firmware/efi/vars.c
kernel/smp.c
sound/soc/soc-pcm.c

Simple merge
diff --cc kernel/smp.c
Simple merge
Simple merge