tag 4d2770e96dd0aab74adeccab36f44095fecfe5e2
tagger Leed Aguilar <leed.aguilar@ti.com> Mon Oct 31 18:05:58 2011 -0400
object bb10c38c127952a7d84cb0b9d6ce8090b61bdd40

4AI.3 Android Release

commit bb10c38c127952a7d84cb0b9d6ce8090b61bdd40
author Dan Murphy <dmurphy@ti.com> Wed Oct 26 10:17:18 2011 -0500
committer Dan Murphy <dmurphy@ti.com> Wed Oct 26 10:17:18 2011 -0500
tree 0b90e2f4e0023a9710c41ce6a18907a591108217
parent 0700a3c3af2f21c6b226dc2c9b7a2b7eeb4cc6fa
parent 99ae0ab9af0b3c53de250c6a7e9d09793f9add0b

Merge branch 'android-omap-3.0' into p-android-omap-3.0

* android-omap-3.0:
  ARM: omap4: check debug uart wake status on i/o pad wakeup
  ARM: omap2: fiq_debugger: restore UART state after ctxt lost
  ARM: omap4: add OMAP support for the fiq debugger
  ARM: common: fiq_debugger: protect the uart state from the sleep timer
  ARM: common: fiq_debugger: add suspend/resume handlers
  ARM: common: fiq_debugger: add uart_enable/disable platform callbacks
  ARM: common: fiq_debugger: add non-fiq debugger support
  ARM: common: fiq_debugger: peek the 0th char in ringbuf
  ARM: common: fiq_debugger: fix the cleanup on errors in probe
  ARM: common: fiq_debugger: do not disable debug when console is enabled
  ARM: omap4: resetreason: add newline to end of reset reason string
  ram_console: pass in a boot info string
  Revert "omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active."
  ARM: omap4: cpuidle: configure MPU C4 state to CSWR
  ARM: omap4: resetreason: export reset reason string

Change-Id: Ifc32c00529e08f43dc2f618a917c168b0a66f8f5
Signed-off-by: Dan Murphy <dmurphy@ti.com>