Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
[firefly-linux-kernel-4.4.55.git] / net / activity_stats.c
2013-07-01 Arve Hjønnevågnet: activity_stats: Stop using obsolete create_proc_re...
2013-07-01 Mike Channet: activity_stats: Add statistics for network transmi...