diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-11 16:36:52 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-11 16:36:52 -0700 |
| commit | 2075186d012c815911494f34fc16aef7c8f3492b (patch) | |
| tree | 5cf4dcdd6e0e61255a4671c1fbc97fd675136dc1 /drivers/staging/Makefile | |
| parent | 96ba231c1546b7c5d20e90437f45bd9089316b86 (diff) | |
| parent | 52f479da0aef99cffafe73fa04dcbcfc0d4616dc (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.10-android
* 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android:
android: fiq_debugger: fix cut-off help message
ipv4: Missing sk_nulls_node_init() in ping_unhash().
android: base-cfg: add ALSA
usb: gadget: add audio dependencies to USB_G_ANDROID
SELinux: ss: Fix policy write for ioctl operations
nf: IDLETIMER: Adds the uid field in the msg
android: configs: Enable SELinux and its dependencies.
SELinux: use deletion-safe iterator to free list
subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
Diffstat (limited to 'drivers/staging/Makefile')
0 files changed, 0 insertions, 0 deletions