On Wed, Jan 09, 2013 at 02:58:16AM +, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 ("ARM:
> coresight: common definition for (OS) Lock Access Register key value")
> from the
On Wed, Jan 09, 2013 at 02:58:16AM +, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 (ARM:
coresight: common definition for (OS) Lock Access Register key value)
from the arm-perf tree
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 ("ARM:
coresight: common definition for (OS) Lock Access Register key value")
from the arm-perf tree and commit 2a3eb5bc45bd ("ARM: tegra: make device
can run on UP")
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/headsmp.S between commit bc4f1bdabc89 (ARM:
coresight: common definition for (OS) Lock Access Register key value)
from the arm-perf tree and commit 2a3eb5bc45bd (ARM: tegra: make device
can run on UP) from
Greg KH wrote at Wednesday, September 12, 2012 10:12 AM:
> On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tegra tree got a conflict in
> > arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> > commits
On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
> the
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
to
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 (ARM: pmu: remove arm_pmu_type enumeration) from
the arm-perf tree and 1ba8216f0bc0 (usb: move phy driver from mach-tegra
to drivers/usb)
On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 (ARM: pmu: remove arm_pmu_type enumeration) from
the arm-perf tree
Greg KH wrote at Wednesday, September 12, 2012 10:12 AM:
On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 (ARM:
10 matches
Mail list logo