Commits on Dec 16, 2011
  1. Reconcile with ics-mr1-release

    Change-Id: Ifb9d8e9321f4089f98600b8813016735a2b3131f
    The Android Open Source Project committed Dec 16, 2011
  2. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 15, 2011
Commits on Dec 15, 2011
  1. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 14, 2011
  2. am 0f45213: Update kernel prebuilt

    * commit '0f4521310f9aaef7bb61264be8a3574c59347941':
      Update kernel prebuilt
    Arve Hjønnevåg committed with Android Git Automerger Dec 14, 2011
  3. Update kernel prebuilt

    8e0f3bc Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
    f59af41 Merge branch 'linux-omap-3.0' into android-omap-3.0
    7ee11a3 OMAP4: PM: omap4_trigger_ioctrl: use proper mask for proper delay
    5a44bf3 ARM: omap4: gpio: Use pad wakeupevent to detect pulses for edge triggered gpios
    aa7b27c ARM: omap4: gpio: Fix omap2_gpio_set_wakeupenables to have an effect
    0f571a6 Revert "Revert "ARM: omap4: gpio: Fix lost gpio edge interrutps in low power idle modes.""
    
    Change-Id: Iab7c12209dfaede9b54c3ca33362e9afb6e7c672
    Arve Hjønnevåg committed Dec 14, 2011
Commits on Dec 14, 2011
  1. @colincross

    am baa510e: tuna: update kernel prebuilt

    * commit 'baa510e85ad67acf27e2e266079809855f6bbddc':
      tuna: update kernel prebuilt
    colincross committed with Android Git Automerger Dec 14, 2011
  2. @colincross

    tuna: update kernel prebuilt

    4ea95b9 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
    c572dd6 Merge branch 'linux-omap-3.0' into android-omap-3.0
    1933680 Revert "HACK: ARM: tuna: disable L3_SLEEP when MHL is active"
    a2b7ca0 omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active.
    f75e54b Merge branch 'linux-omap-3.0' into android-omap-3.0
    
    Change-Id: Ie211023b9ce92455765867785e4184ddc61a98db
    colincross committed Dec 14, 2011
  3. am 3f14ace: new kernel prebuilt

    * commit '3f14acebdca39f25ffa2378cd3d8c024d1ceb2c8':
      new kernel prebuilt
    Erik Gilling committed with Android Git Automerger Dec 14, 2011
  4. new kernel prebuilt

    includes:
    720b316 HACK: video: ti_hdmi: print warning on invalid AKSV
    f5b62aa Revert "HACK: OMAP4: HDCP: enable HDCP debug messages"
    
    Change-Id: Ibae1ec806cd28db4fb4a03db2003f14eb7bc12d1
    Signed-off-by: Erik Gilling <konkers@android.com>
    Erik Gilling committed Dec 14, 2011
  5. Reconcile with ics-mr1-release

    Change-Id: I41613fd28aed3a2725ae944a1e6d0a8f0ee6e446
    The Android Open Source Project committed Dec 13, 2011
  6. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 13, 2011
  7. @benoitgoby

    am 45dfd46: new kernel prebuilt

    * commit '45dfd46501b2475c262d4f2c08453a0f2bd53d8f':
      new kernel prebuilt
    benoitgoby committed with Android Git Automerger Dec 13, 2011
  8. @benoitgoby

    new kernel prebuilt

    49a0ff3 modem_if: io: initialize skb->mac_header before passing it to netif_rx().
    
    Change-Id: Ie3212e51b9cb8f0b19cb2d7c095fa15b2a7a0d2a
    benoitgoby committed Dec 13, 2011
  9. am 253073f: new kernel prebuilt

    * commit '253073f887a6eb251f8cd8647f3eca116ee06924':
      new kernel prebuilt
    Erik Gilling committed with Android Git Automerger Dec 13, 2011
  10. am bba3d2f: Add portrait dock image

    * commit 'bba3d2f3e939c0c6fb044d4500a127ea45c925a7':
      Add portrait dock image
    Erik Gilling committed with Android Git Automerger Dec 13, 2011
  11. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 13, 2011
Commits on Dec 13, 2011
  1. new kernel prebuilt

    includes:
    aa15d2e ARM: tuna: support Samsung's MHL adopter ID
    bdc7da3 HACK: ARM: tuna: disable L3_SLEEP when MHL is active
    68852cb Merge branch 'linux-omap-3.0' into android-omap-tuna-3.0
    93bf526 ARM: tuna: correctly report VBUS/CHARGER on MHL
    3b6efd3 OMAPLFB/DSSCOMP: Added support for non-gralloc layers in Post2
    
    Change-Id: I2cdf1feadbf9be42e92dbda0421bd3a4b25b2ae5
    Signed-off-by: Erik Gilling <konkers@android.com>
    Erik Gilling committed Dec 13, 2011
  2. Add portrait dock image

    Change-Id: Iebb24768b81bb214f093e6148e967820568ec470
    Signed-off-by: Erik Gilling <konkers@android.com>
    Erik Gilling committed Dec 13, 2011
  3. @jefftinker

    am 9395338: Merge "Run tf_daemon as class main instead of class core"…

    … into ics-mr1
    
    * commit '939533862a8218f6fabfd79fd3226d8e6b4e6e0c':
      Run tf_daemon as class main instead of class core
    jefftinker committed with Android Git Automerger Dec 13, 2011
  4. @tinyalsa

    am 7061531: Merge "new kernel prebuilt" into ics-mr1

    * commit '70615311a39714307212f850f1ae8abb667b1dea':
      new kernel prebuilt
    tinyalsa committed with Android Git Automerger Dec 13, 2011
  5. @jefftinker

    Merge "Run tf_daemon as class main instead of class core" into ics-mr1

    jefftinker committed with Android (Google) Code Review Dec 13, 2011
  6. @tinyalsa

    Merge "new kernel prebuilt" into ics-mr1

    tinyalsa committed with Android (Google) Code Review Dec 13, 2011
  7. @tinyalsa

    new kernel prebuilt

    6e26e77 Revert "ARM: omap4: gpio: Fix lost gpio edge interrutps in low power idle modes."
    
    Change-Id: I9b50b80beafcd1ab032e30aa067ef93199d7464c
    tinyalsa committed Dec 13, 2011
  8. @jefftinker

    Run tf_daemon as class main instead of class core

    Change-Id: Ie416980d1cc347a1e939776649bffcfbdd8960ff
    related-to-bug: 5751212
    jefftinker committed Dec 13, 2011
  9. am 7a170e1: audio HAL: release audio pre processing buffers.

    * commit '7a170e19114fefef3f644252d5eabbb5fc6afb9e':
      audio HAL: release audio pre processing buffers.
    Eric Laurent committed with Android Git Automerger Dec 13, 2011
  10. audio HAL: release audio pre processing buffers.

    Buffers allocated for audio pre processing are not released
    when an input stream is closed.
    
    Issue 5753047.
    
    Change-Id: Ie8fd5f49d97e9bebc70fc38de0844a79074ac526
    Eric Laurent committed Dec 13, 2011
Commits on Dec 12, 2011
  1. Reconcile with ics-mr1-release

    Change-Id: I583d42acf0b10b2f276bf0b3dac109f2781e36f9
    The Android Open Source Project committed Dec 12, 2011
Commits on Dec 11, 2011
  1. @toddpoynor

    tuna: prebuilt kernel

    239904e OMAP4: tuna: Mask all twl6030 charge control IRQs except VBUS_DET
    
    Change-Id: I9c86c70473013bf547f414e04a20acd4a32191c2
    Signed-off-by: Todd Poynor <toddpoynor@google.com>
    toddpoynor committed with The Android Automerger Dec 10, 2011
Commits on Dec 10, 2011
  1. @toddpoynor

    am ad025cc: tuna: prebuilt kernel

    * commit 'ad025cc35921cde02ae63ebc88e3aaedcee33b1e':
      tuna: prebuilt kernel
    toddpoynor committed with Android Git Automerger Dec 10, 2011
  2. @toddpoynor

    tuna: prebuilt kernel

    239904e OMAP4: tuna: Mask all twl6030 charge control IRQs except VBUS_DET
    
    Change-Id: I9c86c70473013bf547f414e04a20acd4a32191c2
    Signed-off-by: Todd Poynor <toddpoynor@google.com>
    toddpoynor committed Dec 10, 2011
  3. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Dec 9, 2011
Commits on Dec 9, 2011
  1. @colincross

    am 65ed1e7: tuna: update kernel prebuilt

    * commit '65ed1e7cce8120d3ae551db4b6e3e434efa0a537':
      tuna: update kernel prebuilt
    colincross committed with Android Git Automerger Dec 9, 2011
  2. @colincross

    tuna: update kernel prebuilt

    1fe6938 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
    070b34d Merge branch 'linux-omap-3.0' into android-omap-3.0
    3cb4b13 misc: fsa9480: increase the otg external id stablity delay
    3484c3e mmc: omap_hsmmc: Call mmc_host_enable() in suspend only on success path
    
    Change-Id: I0e54bda2826c3d85bb9fa3b2a8fa87e489c73b28
    colincross committed Dec 9, 2011
  3. @benoitgoby

    am 7de153c: tuna: don\'t use setup_fs on efs partition

    * commit '7de153c1f7bf46f5444f940752e33374dc326041':
      tuna: don't use setup_fs on efs partition
    benoitgoby committed with Android Git Automerger Dec 9, 2011
  4. @benoitgoby

    am fbdda8a: tuna: set root hubs autosuspend delay to 0

    * commit 'fbdda8a8e8646e7e6d1cabb86c787d8591532817':
      tuna: set root hubs autosuspend delay to 0
    benoitgoby committed with Android Git Automerger Dec 9, 2011