aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-12-29register pcap7200 device on gta03.Matt Hsu
Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
2008-12-29MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci-merge
pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage: From: Balaji Rao <balajirrao@openmoko.org> This patch gets the Linux mci stack to use the voltage it negotiated before with the uSD card on resume. Without this, it always reverts to and stays at 3.3V. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Filter AUX key bouncingNelson Castillo
This patch filters AUX key bouncing. We store the state of the AUX button and only change it when we notice that at least AUX_TIMER_CONSECUTIVE_EVENTS consecutive equal GPIO reads occur. This should solve #2185 (AUX button makes interrupt storm) but we still need the confirmation from someone affected by the IRQ storm. In my test setup I could see an improvement but I would only get 1 unwanted IRQ. The next step is to use the same timer for more keys. For that we could use the neo1973kbd_default_key_irq function for the AUX key also. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2008-12-29Move charger initialization from core to mbc driver.Balaji Rao
When irq_handler is called from core, the irqs might not have been yet registered - which means, the initial charger state was not being set properly. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Kill automatic charging restart to retain manual control.Balaji Rao
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Manually restart charger periodicallyBalaji Rao
This avoids excessive discharges seen in case of Li-ion batteries even when charger is connected. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-29Start charging when the usb current limit is changed.Balaji Rao
This makes sure that charging status remains correct when currrent limit is altered from userspace. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-18build-hide-hist-branch-tag.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-18fix-add-gratuiutous-pcf50633-timeout-tickle-in-isr.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-18fix-eint-breakage-by-fuzz.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-14MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatc ↵merge
hes-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322-1229250598 / 1231dc713a5825b92b6809aa417686c579e6a9f9 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-hist-1229249926-1229250322 / 9c01cf722f0536f4827d76d36ee58c070b21c0da ... parent commitmessage: From: merge <null@invalid> MERGE-via-mokopatches-tracking-hist-MERGE-via-master-hist-1229249926 mokopatches-tracking-hist top was MERGE-via-master-hist-1229249926 / 8f700d425b380707d4f2b7052c1b1f7e77c8b7d3 ... parent commitmessage: From: merge <null@invalid> MERGE-mokopatches-tracking-patchset-edits
2008-12-14config-uplevel.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-12MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-mokopatc ↵merge
hes-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516-1229082771 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516-1229082771 / f410ecd0cc4642ae8b0f69c15fe349ea5639f5e2 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516 stable-tracking-hist top was MERGE-via-mokopatches-tracking-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488-1229082516 / 18f9a76ecc30ba8eee5de0627de3e7eb049775c3 ... parent commitmessage: From: merge <null@invalid> MERGE-via-mokopatches-tracking-hist-MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488 mokopatches-tracking-hist top was MERGE-via-master-MERGE-via-master-hist-1229078937-1229079488 / 7eb66508f95eeebbd7ad3487c5183b76524d4765 ... parent commitmessage: From: merge <null@invalid> MERGE-via-master-MERGE-via-master-hist-1229078937 master top was MERGE-via-master-hist-1229078937 / ff0b5902f29135a782a3bfb68e3429b86669aea4 ... parent commitmessage: From: merge <null@invalid> MERGE-master-patchset-edits
2008-12-11MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-kill-evbug- ↵merge
patch-1229015794 pending-tracking-hist top was MERGE-via-stable-tracking-config-kill-evbug-patch-1229015794 / cf65aecd5f77e51a244ff4647afa409056c3d725 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-kill-evbug-patch stable-tracking-hist top was config-kill-evbug-patch / 16e183d5b9b5e0bc6d14877a8815e91d9000792e ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-kill-evbug.patch Reported-by: Klaus Kurzmann <mok@mnet-online.de> Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-10config-gta02-kill-loose-i2c-sensor.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-10config-uplevel-gta02-packaging-configAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-10MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-introduce-gta02-pa ↵merge
ckaging-defc-1228907217 pending-tracking-hist top was MERGE-via-stable-tracking-introduce-gta02-packaging-defc-1228907217 / 03583f856b4029f09b7aee17e1c743cd5d50062f ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-introduce-gta02-packaging-defc stable-tracking-hist top was introduce-gta02-packaging-defc / 893e0396e11b1b697205262dd034a0420dbad0e1 ... parent commitmessage: From: Andy Green <andy@openmoko.com> introduce-gta02-packaging-defconfig Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-10MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-android-com ↵merge
pat-patch-1228904021 pending-tracking-hist top was MERGE-via-stable-tracking-config-android-compat-patch-1228904021 / 73da33f3dea660b98727337d2e6e29bcf29fb419 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-android-compat-patch stable-tracking-hist top was config-android-compat-patch / ff29cd711174bfe525a6cb9c9e37183f367f6558 ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-android-compat.patch Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-10MERGE-via-pending-tracking-hist-MERGE-via-pending-tracking-hist-1228898320merge
pending-tracking-hist top was MERGE-via-pending-tracking-hist-1228898320 / 75e06011b6a2ab443295941791f0e71913d837d5 ... parent commitmessage: From: merge <null@invalid> MERGE-pending-tracking-patchset-edits
2008-12-09MERGE-via-pending-tracking-hist-fix-s3c_irq_demux_extint8-to-hmerge
pending-tracking-hist top was fix-s3c_irq_demux_extint8-to-h / e3a894b0f1fae0caa2224a5d1b3c409fcac9f5cc ... parent commitmessage: From: Balaji Rao <balajirrao@openmoko.org> Fix s3c_irq_demux_extint8 to handle masked but pending IRQs Hi, It was observed that even after the move to level irq on pcf50633, the problem of 'the phone doesn't resume if POWER is pressed during transition to standby' remains. The original problem was due to a lost edge. The present problem - When POWER is pressed during the transition, handle_level_irq runs which looks at the IRQ_DISABLED flag set by pcf50633_suspend and masks the irq on chip. Now when the cpu wakes up (level keeps hitting us), s3c_irq_demux_extint8 runs, which tries to handle all pending irqs. But before it does so, it applies the mask and hence not all pending irqs were acked and hence, our pmu's irq (level) caused an irq flood.. This patch clears those interrupts which are masked, but pending. Fixes the problem for me. Mildly tested. Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
2008-12-08MERGE-andy-tracking-patchset-edits-revert-power-patchesmerge
Whoops this is just reverting a couple of patches that were not ready to be committed yet.
2008-12-08MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-fix-s3c2410_ts-fif ↵merge
o-allocation-1228776491 pending-tracking-hist top was MERGE-via-stable-tracking-fix-s3c2410_ts-fifo-allocation-1228776491 / a85a8a282939b4f6800081f67e1d568e0b97bd7a ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-fix-s3c2410_ts-fifo-allocation stable-tracking-hist top was fix-s3c2410_ts-fifo-allocation / 56a57ba0d4c1d60869250d5f89fae61544f01012 ... parent commitmessage: From: Nelson Castillo <nelsoneci@gmail.com> Fix s3c2410_ts FIFO allocation When I added the FIFO improving the interrupts handlers I introduced a bug. The FIFO is allocated after the interrupts are requested. This makes the kernel crash if the touchscreen generates activity before the allocation takes place. This patch fixes the bug. I reproduced it and tested the fix in a GTA02. - Fix bug - Fix a typo Reported-by: Andy Green <andy@openmoko.com> Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
2008-12-08MERGE-via-pending-tracking-hist-s3c24xx-needs-gpio_trackmerge
pending-tracking-hist top was s3c24xx-needs-gpio_track / da546f30820208681442d98d29aadd2e6a909a09 ... parent commitmessage: From: Werner Almesberger <werner@openmoko.org> S3C24xx needs GPIO_TRACK s3c_gpiolib_getchip for 24xx assumes that, as far as addressing is concerned, all ports have 32 pins. However, there are two flaws in this logic: 1) gpiolib only assigns pin number for real pins (with the exception of gaps added with CONFIG_S3C_GPIO_SPACE), and 2) not all ports have the same number of pins. This patch makes 24xx use the more generic platform s3c_gpiolib_getchip, like we do on 6410. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2008-12-08[PATCH 2_3] S3C24xx: make GPIOs end at H10.emlWerner Almesberger
S3C24xx: make GPIOs end at H10 At least on 2410 and 2442, GPIOs don't end at G10 but at H10 or even J12. Port J is treated as a special case throughout much of the S3C code, so I'm not sure what the plan is for it now. However, it seems safe to include port H. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2008-12-08PATCH-1_3-S3C24xx-GPIO-G-has-16-pins.emlWerner Almesberger
S3C24xx: GPIO G has 16 pins At least on 2410 and 2442, GPIO port G has 16 pins. Signed-off-by: Werner Almesberger <werner@openmoko.org>
2008-12-08MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-touchscreen ↵merge
-group-patch-1228735176 pending-tracking-hist top was MERGE-via-stable-tracking-config-touchscreen-group-patch-1228735176 / b0d334ee992b56e9c97422bcb7d3d4fe239af53e ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-touchscreen-group-patch stable-tracking-hist top was config-touchscreen-group-patch / 51c9b7258ee85644ada4b8bf1db4da2450585675 ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-touchscreen-group.patch Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-08MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-remove-skip-filter ↵merge
-1228733704 pending-tracking-hist top was MERGE-via-stable-tracking-remove-skip-filter-1228733704 / 552c6fdd4c644ab2618ad27564d159ed28bbd859 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-remove-skip-filter stable-tracking-hist top was remove-skip-filter / 92bdef8636873a19efc05b2a19578a0aa93dba41 ... parent commitmessage: From: Nelson Castillo <nelsoneci@gmail.com> Remove skip filter With more reliable points median and mean filters perform a better job. We no longer need this filter. Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
2008-12-06fix-gta03-wlan-power-sequence.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-05fix-gta03-wlan-pm-and-mmc-rescan.patchAndy Green
This fixes problems with not enough signals controlled by WLAN enable and disable (it really does cycle the power) and adapts starting state for Qi change that defaults it all to off. It saves about 50mW pulling the power from it. It also provokes the SDIO stack to go look for the card after power up or down so it tracks presence by this power operation too. Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-05add-force-sdhci-rescan.patchAndy Green
This provides a way for code to force a mmc rescan by using the s3c hsmmc platform device as a handle. It solves the issue of 6410 having two card detect signals mutually exclusive on one physical ball. Ben Dooks told he might implement this another way but we need this on GTA03 right now and can migrate it to any official way that turns up. Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-05fix-jbt6k74-display-onoff-gone.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-05MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-jbt6k74_cleanup_no ↵merge
_deep_sleep-1228475349 pending-tracking-hist top was MERGE-via-stable-tracking-jbt6k74_cleanup_no_deep_sleep-1228475349 / 7e4328b084323f8c35918bc2cb7a3afcf0ddf180 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-jbt6k74_cleanup_no_deep_sleep- stable-tracking-hist top was jbt6k74_cleanup_no_deep_sleep- / f5213710553fe7a94cc0b47740162b8a745fa277 ... parent commitmessage: From: nicolas dufresne <nicolas.dufresne@gmail.com> jbt6k74_cleanup_no_deep_sleep.patch Improve jbt6k74 driver changes to avoid WSOD so they don't stomp on QVGA / VGA mode situation
2008-12-05MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-jbt6k74_no_deep_sl ↵merge
eep-patch-0-1228473838 pending-tracking-hist top was MERGE-via-stable-tracking-jbt6k74_no_deep_sleep-patch-0-1228473838 / 5e9cdd03594ab072a42751e25d1aa2c08d65f13c ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-jbt6k74_no_deep_sleep-patch-0 stable-tracking-hist top was jbt6k74_no_deep_sleep-patch-0 / f2b6b0b0b2d235457e0c69cfdbf4f66a12dc2c4e ... parent commitmessage: From: Nicolas Dufresne <nicolas.dufresne@gmail.com> jbt6k74_no_deep_sleep.patch This patch from https://docs.openmoko.org/trac/ticket/1841 defeats deep sleep on the LCM ASIC and is reported to stop the WSOD behaviour on LCMs that exhibit it.
2008-12-05revert-ldo6-down-in-suspend.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-05MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-build-fix-path-to- ↵merge
toolchain-on-1228470136 pending-tracking-hist top was MERGE-via-stable-tracking-build-fix-path-to-toolchain-on-1228470136 / 21b67ab8e79998b0a534263282dab1dda0f11b00 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-build-fix-path-to-toolchain-on stable-tracking-hist top was build-fix-path-to-toolchain-on / ca14ba894df9b28822066c578dde48d7dbe931de ... parent commitmessage: From: Andy Green <andy@openmoko.com> build-fix-path-to-toolchain-one-at-last.patch Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-04MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-MERGE-via-stable-t ↵merge
racking-hist-1228427992-1228428064 pending-tracking-hist top was MERGE-via-stable-tracking-MERGE-via-stable-tracking-hist-1228427992-1228428064 / a02b19a9e543d49f2217ebd7f743a4082ecc0290 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-MERGE-via-stable-tracking-hist-1228427992 stable-tracking-hist top was MERGE-via-stable-tracking-hist-1228427992 / 5fa26c730284f8aaa399f0a034988e786f383bda ... parent commitmessage: From: merge <null@invalid> MERGE-stable-tracking-patchset-edits
2008-12-04MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-cleanup-add-intern ↵merge
al-functions-1228426177 pending-tracking-hist top was MERGE-via-stable-tracking-cleanup-add-internal-functions-1228426177 / cf9f1f4a754f2db71f829a8b07ac455e053b3d1f ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-cleanup-add-internal-functions stable-tracking-hist top was cleanup-add-internal-functions / 251b632aa7be6c6307a6938a59793e205da5b326 ... parent commitmessage: From: Nelson Castillo <nelsoneci@gmail.com> Cleanup - Add internal functions for clearing filters This patch adds the following functions: * ts_filter_mean_clear_internal * ts_filter_median_clear_internal The idea: avoid calling the clean function of other filters when we initialize one. Also: * modify messages for consistency. * remove an unneeded else. Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
2008-12-04MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-workaround-glamo-m ↵merge
mc-insanity-1228425445 pending-tracking-hist top was MERGE-via-stable-tracking-workaround-glamo-mmc-insanity-1228425445 / 8c97326a7ad33d8690a4b433abc14918e5900e58 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-workaround-glamo-mmc-insanity- stable-tracking-hist top was workaround-glamo-mmc-insanity- / 7a55cd6f948a33c4452dd99da39e15efe832f2e2 ... parent commitmessage: From: sprite_tm <unknown@invalid> workaround-glamo-mmc-insanity-timeout-warning-only.patch Modified version of one line patch from https://docs.openmoko.org/trac/ticket/2078 by sprite_tm Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-04fix-s3c-eint-offset-calc-error.patchAndy Green
There's a bug in calculation of IRQ_EINT_BIT introduced on the test branch for pm changes for s3c by Ben Dooks fixed in this patch. There's also a bit of a mystery about how wake gets to wake EINT set of interrupts, I added a couple of lines that make it work for EINT4+ but not sure what's meant to be there for EINT0-3. Still, this gets GTA02 resume working again. cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-04MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-jbt6k74_no_deep_sl ↵merge
eep-patch-1228416934 pending-tracking-hist top was MERGE-via-stable-tracking-jbt6k74_no_deep_sleep-patch-1228416934 / 2920ea8e9a869e224ec22dea02c85def3910ff57 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-jbt6k74_no_deep_sleep-patch stable-tracking-hist top was jbt6k74_no_deep_sleep-patch / 8e318ae8cab52b85323a36ac7808bf33e7a98797 ... parent commitmessage: From: Nicolas Dufresne <nicolas.dufresne@gmail.com> jbt6k74_no_deep_sleep.patch This patch from https://docs.openmoko.org/trac/ticket/1841 defeats deep sleep on the LCM ASIC and is reported to stop the WSOD behaviour on LCMs that exhibit it.
2008-12-04fix-gta03-gsm-module-startup.patchAndy Green
Power on is active low for GTA03 GSM module Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-04MERGE-via-pending-tracking-hist-patch-andy-tracking-merge-breamerge
pending-tracking-hist top was patch-andy-tracking-merge-brea / 2010fb7565e8239f893d3631c3b1ccc7766f26b9 ... parent commitmessage: From: Werner Almesberger <werner@openmoko.org> PATCH-andy-tracking-merge-breakage-pending-tracking-fix.patch Fix merge breakage in pending-tracking. With this patch, 0b519f14e15365213924505e2e3019c1ff159aa9 builds for GTA02 and it even boots ! ;-) Signed-off-by: Werner Almesberger <werner@openmoko.org>
2008-12-03fix-actual-level-problem.patchAndy Green
Matt's patch managed to get applied twice because the context of the diff was met perfectly in another place... This reverts that and also reverts the GTA03 specific level stuffs. Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03workaround-decide-PMU-interrupt-level-at-build-time.patchAndy Green
No need AFAIK to revert GTA02 build to edge as well as GTA03, so this patch builds the driver with the edge for GTA03 only and otherwise level. Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-config-gta02-uplev ↵merge
el-s3c-fifo-1228311801 pending-tracking-hist top was MERGE-via-stable-tracking-config-gta02-uplevel-s3c-fifo-1228311801 / 45e034c117209b4b983559b3cc9324988cb74cae ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-config-gta02-uplevel-s3c-fifo- stable-tracking-hist top was config-gta02-uplevel-s3c-fifo- / c33ca63570576d6ef09f7b84d12ec124af08ea6e ... parent commitmessage: From: Andy Green <andy@openmoko.com> config-gta02-uplevel-s3c-fifo-option.patch Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03config-gta03-pm-64xx-uplevel.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03revert-gta03-edge-interrupt.patchAndy Green
Uh oh... boot dies on GTA03 with level interrupt on pcf50633.. just stalls after the interrupt is requested without managing to reach the ISR. This patch bodges it back to falling edge which is working. Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03fix-gta03-init-platform-power-management.patchAndy Green
This gets GTA03 using the new 6410 power management stuff in Ben Dooks' tree Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03fix-balaji-64xx-regulator-init-change-pm.c.patchAndy Green
Signed-off-by: Andy Green <andy@openmoko.com>
2008-12-03MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-repair-broken-incl ↵merge
ude-patch-1228304201 pending-tracking-hist top was MERGE-via-stable-tracking-repair-broken-include-patch-1228304201 / 63bf64cf29947936235ade35a4faf33dc8919b68 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-repair-broken-include-patch stable-tracking-hist top was repair-broken-include-patch / aab327f537d98b0bd48be4b7f61811f9b60ddd02 ... parent commitmessage: From: Andy Green <andy@openmoko.com> repair-broken-include.patch Signed-off-by: Andy Green <andy@openmoko.com>