summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | |\
| | | | * prebuilt kernel: wimax fix, ipv6 crash fixJP Abgrall2012-05-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00a60d1 Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip-mergedown a0e6c2f ipv6: check return value for dst_alloc 25914de net: check return value for dst_alloc 3ac7360 net: wimax: suspend and resume issue in JB Change-Id: Ifebddc53a48608ef9172de4db90bc4413c54b28b
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-040-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-300-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-260-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * crespo: kernel prebuiltDmitry Shmidt2012-04-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bc1344 net: wireless: bcmdhd: Allow 80211_HT capability Change-Id: I3ad00ce2d8e9119c8e63468263e3701c67f93e03 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-120-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-110-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * Merge commit 'ed5609f' into jb-releaseThe Android Automerger2012-04-032-86/+18
| | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: kernel
| | | | | | | | | | | | | | | | | | | | | * | crespo: kernel prebuiltDmitry Shmidt2012-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 937fb8b Merge branch 'android-3.0' into android-samsung-3.0-wip f764be6 net: wireless: bcmdhd: Fix crash in dhd_preinit_ioctls() band set 54ba9e6 net: wireless: bcmdhd: Add CONFIG_DHD_ENABLE_P2P Kconfig option 7067adf misc: fsa9480: disable/enable irq on suspend/resume Change-Id: I37a746609608e1d19a196b9195d4fa19bae1e342 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | | | | | | | | | | | | | | | | | | | | * | merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * | kernel update (mostly: KSM, wifi, gpu:pvr:disable MMU write-prot)JP Abgrall2012-03-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b43c016 Revert "gpu: pvr: Switch on MMU pagetable write-protection." dc8b29b Merge branch 'android-3.0' into android-samsung-3.0-wip 5a6caf9 net: wireless: bcmdhd: Set probe_resp.timestamp value to scan results 51feefe net: wireless: bcmdhd: Add constant mDNS filter 91f01cc net: wireless: bcmdhd: Add WL_CFG80211_STA_EVENT config option 5f3af06 herring_defconfig: enable KSM 4b04b81 net: wireless: bcmdhd: Update to Version 5.90.195.35 Change-Id: Iea46b4ca92717422306cd4bf020c362658ec53fc
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \