Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Tue, 13 Jan 2015 11:55:38 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 13 Jan 2015 11:55:38 +0000 (11:55 +0000)
1  2 
drivers/cpufreq/cpufreq_interactive.c
net/ipv6/addrconf.c

Simple merge
Simple merge