summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into androidHEADmasterandroidJon Medhurst2014-04-245-111/+71
|\
| * gator: Use for_each_kernel_tracepoint in Linux 3.15Drew Richardson2014-04-242-1/+62
| * gator: Remove generic GPU tracepoint supportDrew Richardson2014-04-243-110/+9
* | Merge branch 'master' into androidJon Medhurst2014-04-10119-1122/+4349
|\|
| * gator-daemon: Fix compilation error: 'sa_family_t' does not name a typeJon Medhurst2014-04-091-1/+2
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2014-04-091-2/+2
| * gator: Version 5.18DS-5.18Jon Medhurst2014-04-09119-1124/+4350
* | Merge branch 'master' into androidJon Medhurst2013-12-1952-504/+1104
|\|
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-12-181-2/+2
| * gator-driver: Handle task struct correctlyDrew Richardson2013-12-182-24/+52
| * gator: Version 5.17Jon Medhurst2013-12-1851-486/+1058
* | Merge branch 'master' into androidJon Medhurst2013-10-1140-642/+1850
|\|
| * gator-driver: Fix building on Linux 3.12Jon Medhurst2013-10-111-0/+2
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-10-101-2/+2
| * gator: Version 5.16Jon Medhurst2013-10-1040-644/+1850
* | Merge branch 'master' into androidJon Medhurst2013-06-1749-1181/+984
|\|
| * gator: Prevent BUG() when no device-tree cpu nodes present.Jon Medhurst2013-06-171-1/+17
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-06-111-0/+8
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-06-111-2/+2
| * gator: Version 5.15Jon Medhurst2013-06-1150-1190/+969
* | Merge branch 'master' into androidJon Medhurst2013-04-261-0/+8
|\|
| * gator: Use device-tree when available for address of pl310 cacheJon Medhurst2013-04-261-0/+8
* | Merge branch 'master' into androidJon Medhurst2013-04-03116-1397/+12450
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-04-031-0/+8
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-04-031-2/+2
| * gator: Version 5.14Jon Medhurst2013-04-03116-1407/+12452
* | gator-daemon: Add files missing from original commit of DS-5.13Jon Medhurst2013-01-153-0/+405
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-01-151-0/+8
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-01-151-2/+2
| * gator: Version 5.13Jon Medhurst2013-01-1562-2737/+3274
* | Merge branch 'master' into androidJon Medhurst2013-01-1459-2727/+2867
|\ \
| * | gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2013-01-141-0/+8
| * | gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2013-01-141-2/+2
| * | gator: Version 5.13Jon Medhurst2013-01-1459-2737/+2869
| |/
* | Merge branch 'master' into androidJon Medhurst2012-11-0558-956/+1048
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-10-261-0/+8
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-10-261-2/+2
| * gator-driver: Stop using VM_EXECUTABLEJon Medhurst2012-10-261-11/+6
| * gator: Version 5.12Jon Medhurst2012-10-2658-956/+1045
* | Merge branch 'master' into androidJon Medhurst2012-08-1049-1492/+3280
|\|
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-08-101-0/+8
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-08-101-2/+2
| * gator: Version 5.11Jon Medhurst2012-08-1049-1501/+3281
* | Merge branch 'master' into androidJon Medhurst2012-07-134-14/+51
|\|
| * gator-driver: Move work scheduling to timersWade Cherry2012-07-134-14/+51
* | Merge branch 'master' into androidJon Medhurst2012-05-181-2/+2
|\|
| * gator-driver: Revert #error about lack of CONFIG_PERF_EVENTSJon Medhurst2012-05-181-2/+2
* | Merge branch 'master' into androidJon Medhurst2012-05-1686-2472/+10508
|\|
| * gator-daemon: Fix sequence-point compile errorJon Medhurst2012-05-162-2/+2
| * gator-driver: Default GATOR_MALI_INTERFACE_STYLE to '2'Jon Medhurst2012-05-161-0/+8