| commit | fe0bd690095978fd817ae0ee90e23edb43841cc4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 17 16:30:41 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 17 16:30:41 2009 -0700 |
| tree | 9d8c1a8b2f4d3c2808154ab634c9a458b422bc33 | |
| parent | e97d33d5ee914244d6c69789f4f7bbe3ebac1102 [diff] | |
| parent | 8232b50d981ce9c584fc1a4af82dae5e70e6ce52 [diff] |
Merge commit 'remotes/korg/cupcake' into merge Conflicts: include/hardware/overlay.h