| commit | d9f2b8a704edda24f7c184e026de4d80716426e7 | [log] [tgz] |
|---|---|---|
| author | paris_yeh <paris_yeh@asus.com> | Thu Apr 12 21:05:38 2012 +0800 |
| committer | paris_yeh <paris_yeh@asus.com> | Thu Apr 12 21:14:29 2012 +0800 |
| tree | ac6f498d8e2e3284770de8cde700d21196f79c0d | |
| parent | 1454a80d50649efff878be1bc4b142402db64b7a [diff] | |
| parent | 1827824d541eef3899122e9040e0662042d935d1 [diff] |
Merge remote-tracking branch 'etrd/rel-15' into scoop-grouper-t30-rel-15 Conflicts: arch/arm/configs/tegra3_android_defconfig arch/arm/mach-tegra/tegra3_emc.c arch/arm/mach-tegra/tegra3_emc.h drivers/input/keyboard/gpio_keys.c drivers/net/wireless/bcmdhd/Makefile drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c drivers/usb/gadget/fsl_udc_core.c sound/soc/tegra/Makefile sound/soc/tegra/tegra_rt5640.c Change-Id: I674153362ab9abd76c1e6abea20f6d15a4349108