)]}'
{
  "commit": "0f0df2f5a2df9fde7a07d6d27ccf4c619e5bf925",
  "tree": "50090fd1a3effe8a6a6a29e05d9d33976ecc1dcf",
  "parents": [
    "05fb865d7c58f2a8cb09ebe88c0af5e86c5edcf8",
    "4181239136b9fb0b2c000fbff691f361dc9d48e5"
  ],
  "author": {
    "name": "Brian Muramatsu",
    "email": "btmura@google.com",
    "time": "Wed Aug 01 23:30:40 2012 -0700"
  },
  "committer": {
    "name": "Brian Muramatsu",
    "email": "btmura@google.com",
    "time": "Wed Aug 01 23:30:40 2012 -0700"
  },
  "message": "Merge branch \u0027caf\u0027 into android-msm-mako-3.4-wip\n\n* caf: (219 commits)\n  usb: msm_otg: Fix error handling bug in driver probe\n  bluetooth: Add support for LE conn param\n  msm: ocmem: Initialize the ocmem graphics mPU\n  msm: ocmem: Add support for low power clients\n  msm-fb: display: Tearing issue during video playback\n  ASoC: WCD9304: Fix register sequence for analog mic recording\n  msm: clock-8974: Correct some audio interface clock structures.\n  ASoC: wcd9310: Clear the status only for active slimbus ports\n  msm: kgsl: Allow non-default timeout values in adreno_idle\n  msm: cache_erp: Add device tree support\n  ASOC: msm: Add device tree specific changes in compressed driver\n  drivers: leds-pm8xxx: enable low power mode for RGB LED\n  msm: 8974: Add function to reserve memory from device tree\n  msm: clock-8974: Add block reset support for the USB cores\n  msm_fb: display: Brightness change observed when switching HDMI on\n  msm: mpq8064: Dummy read to prevent false interrupt from triggering\n  mmc: msm_sdcc: Enable AUTO_PROG_DONE for CMD25\n  msm: rpm: remove the sanity check in rpm log\n  msm: camera: Add some minor code fixes.\n  msm: Always compile acpuclock-krait when CONFIG_ARCH_MSM_KRAIT is set\n  ...\n\nConflicts:\n\tarch/arm/mach-msm/clock-8960.c\n\tarch/arm/mach-msm/subsystem_restart.c\n\tdrivers/media/video/msm/msm_camirq_router.c\n\tdrivers/media/video/msm/msm_mctl.c\n\tdrivers/usb/gadget/f_mass_storage.c\n\tdrivers/video/msm/msm_fb.c\n\tsound/soc/msm/apq8064.c\n",
  "tree_diff": []
}