renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code
202e4851f8
linux-next/drivers/pinctrl/sirf
History
Linus Walleij 29c7f1f53b pinctrl: sirf: fix a bad conflict resolution 
Commit 294d1351ff
"pinctrl: sirf: switch to using allocated state container"
caused a build conflict due to a bad conflict resolution
when cherry-picking the patch. Fix it up.

Cc: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-05-30 09:52:43 +02:00
..
Makefile pinctrl:sirf:re-arch and add support for new SiRFatlas6 SoC 2013-06-16 11:56:49 +02:00
pinctrl-atlas6.c pinctrl: sirf: update copyright years to 2014 2014-02-25 10:49:13 +01:00
pinctrl-prima2.c pinctrl: sirf: update copyright years to 2014 2014-02-25 10:49:13 +01:00
pinctrl-sirf.c pinctrl: sirf: fix a bad conflict resolution 2014-05-30 09:52:43 +02:00
pinctrl-sirf.h pinctrl: sirf: add USB1/UART1 pinmux usb/uart share 2013-10-08 10:19:26 +02:00