aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master/rebuild/24-drivers-net' into master/master-rtK2_RT_LINUX_03.10.61_15.02v3.10.61/master-rtReece R. Pollack2015-02-241-126/+1
|\
| * Revert "net: keystone: Add TX queue depth resizing to NetCP QoS"Reece R. Pollack2015-02-241-126/+1
* | Merge branch 'master/rebuild/24-drivers-net' into master/master-rtReece R. Pollack2015-02-241-1/+126
|\|
| * net: keystone: Add TX queue depth resizing to NetCP QoSReece R. Pollack2015-02-241-1/+126
* | Merge branch 'master/rebuild/20-firmware' into master/master-rtReece R. Pollack2015-02-2420-4746/+5237
|\ \
| * | firmware: keystone: Update NetCP PA PDSP firmware to 3.0.1.4Reece R. Pollack2015-02-2420-4746/+5237
* | | Merge branch 'master/rebuild/24-drivers-net' into master/master-rtReece R. Pollack2015-02-166-268/+125
|\ \ \ | | |/ | |/|
| * | net: keystone: Remove NetCP CPSW ALE VLAN configurationReece R. Pollack2015-02-164-155/+2
| * | net: keystone: Fix memory leak in CPSW ALE configurationReece R. Pollack2015-02-163-59/+64
| * | net: keystone: Remove erroneous dmaengine_pause calls in PA shutdownReece R. Pollack2015-02-162-3/+0
| * | net: keystone: k2e k2l changes paired with k2hkWingMan Kwok2015-02-161-53/+61
* | | Merge branch 'master/rebuild/23-drivers-dmaengine' into master/master-rtReece R. Pollack2015-02-161-2/+5
|\ \ \
| * | | dma: keystone: Fix memory leak freeing DMA descriptorsReece R. Pollack2015-02-161-2/+5
* | | | Merge branch 'master/rebuild/22-drivers-hwqueue' into master/master-rtReece R. Pollack2015-02-162-4/+25
|\ \ \ \
| * | | | hwqueue: Fix race in disabling interrupt notificationsReece R. Pollack2015-02-162-4/+25
* | | | | Merge branch 'master/rebuild/01-upstream' into master/master-rtReece R. Pollack2015-02-045-3/+59
|\ \ \ \ \
| * | | | | net: Fix skb->protocol setting for mixed IPsec tunnelsReece R. Pollack2015-02-042-2/+16
| * | | | | net: Add IPv4 ICMP support to GSOReece R. Pollack2015-02-043-1/+43
* | | | | | Merge branch 'master/rebuild/20-firmware' into master/master-rtReece R. Pollack2015-02-0316-3861/+3850
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | firmware: keystone: Update NetCP PA 3.0.1.3 firmware (several bugfixes)Reece R. Pollack2015-02-0316-3861/+3850
* | | | | | Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master-rtMurali Karicheri2015-01-302-0/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | net: keystone: disable slave port state on ifdownMurali Karicheri2015-01-302-0/+10
* | | | | | Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master-rtMurali Karicheri2015-01-301-0/+26
|\ \ \ \ \ \
| * | | | | | ARM: keystone: add a work around to handle external abortMurali Karicheri2015-01-301-0/+26
* | | | | | | Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master-rtMurali Karicheri2015-01-222-5/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | net: keystone: ale: fix sysfs attribute issue when debug options are enabledMurali Karicheri2015-01-221-0/+3
| * | | | | | net: keystone: Update NetCP PA2 PDSP constant for 3.0.1.3 firmwareMurali Karicheri2015-01-221-5/+5
* | | | | | | Merge branch 'v3.10.61/rebuild/20-firmware' into v3.10.61/master-rtMurali Karicheri2015-01-2220-305/+306
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | firmware: keystone: Update NetCP PDSP firmware to 3.0.1.3Murali Karicheri2015-01-2220-305/+306
* | | | | | | Merge branch 'v3.10.61/rebuild/12-keystone-machine' into v3.10.61/master-rtMurali Karicheri2015-01-221-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | ARM: keystone: allow FORCE_MAX_ZONEORDER to be configurable on KeystoneMurali Karicheri2015-01-221-1/+1
* | | | | | | Merge branch '40-kexec' into master-rtVitaly Andrianov2015-01-2111-28/+1688
|\ \ \ \ \ \ \
| * | | | | | | arm: keystone2: add default config and DTS for recovery kernelVitaly Andrianov2015-01-212-0/+1613
| * | | | | | | arm: keystone2: kexec: change load address for recovery kernelVitaly Andrianov2015-01-213-5/+22
| * | | | | | | arm: keystone2: defconfig: enable KEXEC and CRASH_DUMPVitaly Andrianov2015-01-212-4/+4
| * | | | | | | arm: keystone2: use ks2 aliased physical address for cpu_resetVitaly Andrianov2015-01-211-0/+4
| * | | | | | | arm: keystone2: kexec: convert physical to aliased addresses and backVitaly Andrianov2015-01-214-19/+45
| * | | | | | | Merge branch '15-dts' into master2Vitaly Andrianov2015-01-201-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '13-defconfig' into master2Vitaly Andrianov2015-01-202-10/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '12-mach' into master2Vitaly Andrianov2015-01-201-13/+24
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master/rebuild/15-keystone-devicetree' into master/masterHao Zhang2015-01-161-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'v3.10.61/rebuild/13-keystone-defconfig' into v3.10.61/masterMurali Karicheri2015-01-152-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v3.10.61/rebuild/15-keystone-devicetree' into v3.10.61/masterMurali Karicheri2015-01-143-0/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v3.10.61/rebuild/34-drivers-crypto' into v3.10.61/masterMurali Karicheri2015-01-121-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rebuild/29-drivers-rproc' into v3.10/masterMurali Karicheri2014-12-241-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master/rebuild/24-drivers-net' into master/masterReece R. Pollack2014-12-221-9/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master/rebuild/20-firmware' into master/masterReece R. Pollack2014-12-2220-1985/+2003
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master/rebuild/24-drivers-net' into master/masterReece R. Pollack2014-12-181-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rebuild/15-keystone-devicetree'WingMan Kwok2014-12-183-10/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rebuild/13-keystone-defconfig'WingMan Kwok2014-12-182-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \