linux-uconsole/include/uapi/sound
Huang, Tao d03390bfcd LSK Android 14.11 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUdvtFAAoJECTWi3JdVIfQn3sH/i7lx5lXGQcZ6HsynmZkqA4J
 9G0kenDhW6Rm0YGetIR3DMTNSkrYbL3rBLPd6Vl+CXx8l1hORlostEBvtMnFK0u/
 B289o6qtW7dc8zzYW5jpwMgC+WNeFD4Gn7/x3bDguYLqMPtbbrr3vzsGaKKmScbJ
 AOyOsZR4TVUi+SUzeCbN8YDW9HSQNhVYrA/qcI6ImASOaKYN4i0stHKMUVoI4HxF
 +e9F40P7Lg8zBM4Ss8X9yYlFxX2EwuKLNrelCvXPo6BBcvjZZM4C4MUvh9c8AyDa
 0LiCgVL3fXb4S+bmJwgRKYm5C9TPpulL3VUDn3fGuVqy9HHfBaC62kc8XX8ciAo=
 =aswn
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.11'

LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h
2014-12-05 21:18:34 +08:00
..
asequencer.h
asound.h rk3288 spdif: spdif sound support 2014-03-22 17:40:01 +08:00
asound_fm.h
compress_offload.h ALSA: compress: Cancel the optimization of compiler and fix the size of struct for all platform. 2014-06-26 15:12:41 -04:00
compress_params.h ALSA: compress: add num_sample_rates in snd_codec_desc 2014-11-06 16:41:48 -08:00
emu10k1.h
hdsp.h
hdspm.h
Kbuild
sb16_csp.h
sfnt_info.h