Stephen Boyd 38d8910730 Merge branch 'qandroid-3.10' into msm-3.10 ... * qandroid-3.10: (636 commits) netfilter: xt_qtaguid: Protect iface list access with necessary lock HID: magicmouse: Fix build warning USB: gadget: mtp: Fix OUT endpoint request length usage in read USB: gadget: f_mtp: Fix using tx buffer pointer msm: Fix race condition in domain lookup msm: Add null-pointer checks for domains base: sync: increase size of sync_timeline name USB: gadget: mtp: Add module parameters for Tx transfer length msm: iommu: Lock the genpool allocation gpu: ion: fix page offset in dma_buf_kmap() gpu: ion: Fix bug in ion_system_heap map_user gpu: ion: Only map as much of the vma as the user requested gpu: ion: use vmalloc to allocate page array to map kernel gpu: ion: Remove dead comments gpu: ion: Minimize allocation fallback delay mmc: sd: Set the card removed if card detect fails gpu: ion: don't fault in individual pages for the CP heap gpu: ion: do not ask for compound pages in system heap gpu: ion: Modify the system heap to try to allocate large/huge pages gpu: ion: Set the dma_address of the sg list at alloc time ... Conflicts: arch/arm/Kconfig arch/arm/include/asm/hardware/cache-l2x0.h arch/arm/mm/cache-l2x0.c drivers/mmc/card/block.c drivers/usb/gadget/udc-core.c		2013-09-04 14:46:18 -07:00
..
auto_group.c
auto_group.h
clock.c
core.c	Merge branch 'qandroid-3.10' into msm-3.10	2013-09-04 14:46:18 -07:00
cpuacct.c
cpuacct.h
cpupri.c
cpupri.h
cputime.c	vtime: Use consistent clocks among nohz accounting	2013-05-31 11:31:50 +02:00
debug.c
fair.c	sched: provide per cpu-cgroup option to notify on migrations	2013-08-22 18:08:00 -07:00
features.h
idle_task.c	sched: Keep at least 1 tick per second for active dynticks tasks	2013-05-04 08:32:02 +02:00
Makefile	sched_avg: add run queue averaging	2013-07-08 05:51:38 -07:00
rt.c	sched: remove migration notification from RT class	2013-08-22 18:08:04 -07:00
sched.h	sched: provide per cpu-cgroup option to notify on migrations	2013-08-22 18:08:00 -07:00
sched_avg.c	sched_avg: add run queue averaging	2013-07-08 05:51:38 -07:00
stats.c
stats.h
stop_task.c