On Thu, Nov 29, 2012 at 04:29:45PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
> of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
> Rem
On Thu, Nov 29, 2012 at 04:27:30PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-tiehrpwm.c between commit 3e9fe83d278c ("pwm: remove use
> of __devinit") from the driver-core tree and commit 53ad9e8d3703 ("pwm:
> tieh
On Thu, Nov 29, 2012 at 04:25:14PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-tiecap.c between commit 3e9fe83d278c ("pwm: remove use of
> __devinit") from the driver-core tree and commit 333b08ee8c6e ("pwm:
> tiecap
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
Remove pwm-twl6030 driver") from the pwm tree.
I fixed it up (the latter removed
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-tiehrpwm.c between commit 3e9fe83d278c ("pwm: remove use
of __devinit") from the driver-core tree and commit 53ad9e8d3703 ("pwm:
tiehrpwm: Add device-tree binding") from the pwm tree.
I fixed it up (see below)
Hi Thierry,
Today's linux-next merge of the pwm tree got a conflict in
drivers/pwm/pwm-tiecap.c between commit 3e9fe83d278c ("pwm: remove use of
__devinit") from the driver-core tree and commit 333b08ee8c6e ("pwm:
tiecap: Add device-tree binding") from the pwm tree.
I fixed it up (see below) and
6 matches
Mail list logo
