On Thu, 29 Nov 2012 15:57:23 +1100, Stephen Rothwell
wrote:
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of
> __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em:
> convert
On Thu, 29 Nov 2012 15:57:23 +1100, Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of
__devinit) from the driver-core tree and commit 7385500a49b7
On Thu, Nov 29, 2012 at 03:57:23PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the gpio tree got a conflict in
> drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of
> __devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em:
>
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-em.c between commit 3836309d9346 ("gpio: remove use of
__devinit") from the driver-core tree and commit 7385500a49b7 ("gpio/em:
convert to linear IRQ domain") from the gpio tree.
I fixed it up (see below) and
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of
__devinit) from the driver-core tree and commit 7385500a49b7 (gpio/em:
convert to linear IRQ domain) from the gpio tree.
I fixed it up (see below) and can
On Thu, Nov 29, 2012 at 03:57:23PM +1100, Stephen Rothwell wrote:
Hi Grant,
Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-em.c between commit 3836309d9346 (gpio: remove use of
__devinit) from the driver-core tree and commit 7385500a49b7 (gpio/em:
convert to
6 matches
Mail list logo