On 14-06-19 05:02 PM, Paul, Charlie wrote:
The following changes since commit 0651cf0a88bb3a8026328436bffc72da221f6ddf:
Merge branch 'standard/base' into standard/axxia/base (2014-06-16
12:25:09 -0400)
Can you rebase this branch onto the latest standard/axxia/base ? I'm
getting conflicts
The following changes since commit 0651cf0a88bb3a8026328436bffc72da221f6ddf:
Merge branch 'standard/base' into standard/axxia/base (2014-06-16 12:25:09
-0400)
are available in the git repository at:
https://github.com/z8cpaul/lsikernel-3.10 sab-next
for you to fetch changes up to
The following changes since commit f027472523d4969f3d78226c3fb1c6bacb05e8f7:
arch/arm/mach-axxia: Move Simulutaion/Emulation WFE/SEV Work-Around
(2014-05-20 15:29:24 -0700)
are available in the git repository at:
https://github.com/z8cpaul/lsikernel-3.10 sab-delivery-2
for you to fetch
On 14-06-05 02:07 PM, Paul, Charlie wrote:
The following changes since commit f027472523d4969f3d78226c3fb1c6bacb05e8f7:
arch/arm/mach-axxia: Move Simulutaion/Emulation WFE/SEV Work-Around
(2014-05-20 15:29:24 -0700)
are available in the git repository at:
Bruce,
I resubmitted this request, I had given you the wrong starting point, this
should fix the merge problem
Charlie
The following changes since commit 55bf6f0b78353c34d4910bca7bfc9eed0aff5de4:
Merge branch 'standard/base' into standard/axxia/base (2014-04-01 21:11:34
-0400)
are
On 2014-04-28, 1:28 PM, Paul, Charlie wrote:
Bruce,
I resubmitted this request, I had given you the wrong starting point,
this should fix the merge problem
Indeed. This merged as a fastforward to the existing BSP branch and
has now been pushed to the repo.
Bruce
Charlie
The following
On 2014-03-07, 5:18 PM, Paul, Charlie wrote:
The following changes since commit 6bdb157889b49e7e8646e03f49d8613dd15e8954:
Merge branch 'standard/base' into standard/axxia/base (2014-02-27 15:39:47
-0500)
are available in the git repository at:
The following changes since commit 6bdb157889b49e7e8646e03f49d8613dd15e8954:
Merge branch 'standard/base' into standard/axxia/base (2014-02-27 15:39:47
-0500)
are available in the git repository at:
https://github.com/butlerpaul/lsikernel-3.10.git sab-next
for you to fetch changes up to
