| commit | 58634ac42e736eea0e8b93cec610174879d36d58 | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Tue Jan 14 21:51:43 2014 -0800 |
| committer | Ethan Chen <intervigil@gmail.com> | Tue Jan 14 21:51:43 2014 -0800 |
| tree | 4179bdb042aa497dd2fb3c7d0cddc88e244e5237 | |
| parent | fda73056f62d84376a3d29926708b4a08155da31 [diff] | |
| parent | a995dd1c29426a074364170359a026f68e8426db [diff] |
Merge remote-tracking branch 'codeaurora/kk_2.7_rb1.21' into cm-11.0 Conflicts: drivers/media/video/msm/msm_vfe32.h drivers/media/video/msm/vfe/msm_vfe32.c net/wireless/reg.c Change-Id: I073c609cfa1c461249bf728b28249bcaa1eaa211