| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Mon, 4 May 2015 16:37:29 +0000 (11:37 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Mon, 4 May 2015 16:37:29 +0000 (11:37 -0500) | ||
| commit | a89344a93db8aa28a7e918184c8fc8b57f30a819 | |
| tree | 15e2a8dce9200b760e1fff47314189cf0369f394 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 0ffdf7ec3109378d4c04fbbc5957f8b2ff99b6fe | commit | diff |
| parent | e6665aa9d5c6ff93921ce3ec3904dd15d690808d | commit | diff |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into p-android-3.14
* 'android-3.14' of https://android.googlesource.com/kernel/common:
ipv4: Missing sk_nulls_node_init() in ping_unhash().
cpufreq: interactive: Round up timer_rate to match jiffy
cpufreq: interactive: Don't set floor_validate_time during boost
SELinux: ss: Fix policy write for ioctl operations
nf: IDLETIMER: Adds the uid field in the msg
Change-Id: I5a5345c60ea2ccffe90a456e67bab115b34176c7
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'android-3.14' of https://android.googlesource.com/kernel/common:
ipv4: Missing sk_nulls_node_init() in ping_unhash().
cpufreq: interactive: Round up timer_rate to match jiffy
cpufreq: interactive: Don't set floor_validate_time during boost
SELinux: ss: Fix policy write for ioctl operations
nf: IDLETIMER: Adds the uid field in the msg
Change-Id: I5a5345c60ea2ccffe90a456e67bab115b34176c7
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>