aboutsummaryrefslogtreecommitdiff
path: root/net/batman-adv/unicast.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-14 15:43:52 +0000
committerMark Brown <broonie@linaro.org>2013-11-14 15:43:52 +0000
commitf3401c581ccf80d60107699c012da3f820f88b9e (patch)
tree82ee3d8d33b52f71bd90e2fdee0a22df2ed581fc /net/batman-adv/unicast.h
parent4cb518ab3d962ac6d0249f47a512127364ddf7da (diff)
parent76e8de404a34bfff318da0b31e752db2642511f3 (diff)
downloadvexpress-lsk-f3401c581ccf80d60107699c012da3f820f88b9e.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android
The cpufreq_interactive changes have been merged upstream and the local version dropped. Conflicts: drivers/cpufreq/cpufreq_interactive.c
Diffstat (limited to 'net/batman-adv/unicast.h')
0 files changed, 0 insertions, 0 deletions