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)
commit6e030a4d929e8a7095debdaec8920ac879706ca8
tree3c63e443fd75f5c8e77ec474a2d6609ff4f4a71d
parenta2ac82c9d0b5898426a9379d8c3855b03614dbf6
parentd88f67b8441516e42e59a064546ac3a78a992d82
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
drivers/cpufreq/cpufreq_interactive.c
net/ipv6/addrconf.c