renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
Code
d5cc66e957
linux-next/drivers/pinctrl/sh-pfc
History
Linus Walleij 6ad30ce046 Linux 3.11-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJSGqS5AAoJEHm+PkMAQRiGFxEH/3VrqF6WAkcviNiW/0DCdO8k
 v6Wi7Sp5LxVkwzmOCHCV1tTHwLRlH3cB9YmJlGQ0kHCREaAuEQAB0xJXIW7dnyYj
 Qq7KoRZEMe3wizmjEsj8qsrhfMLzHjBw67hBz2znwW/4P7YdgzwD7KRiEat+yRC9
 ON3nNL2zIqpfk92RXvVrSVl4KMEM+WNbOfiffgBiEP24Ja1MJMFH1d4i6hNOaB0x
 9Pb3Lw8let92x+8Ao5jnjKdKMgVsoZWbN/TgQR8zZOHM38AGGiDgk18vMz+L+hpS
 jqfjckxj1m30jGq0qZ9ZbMZx3IGif4KccVr30MqNHJpwi6Q24qXvT3YfA3HkstM=
 =nAab
 -----END PGP SIGNATURE-----

Merge tag 'v3.11-rc7' into devel

Merged in this to avoid conflicts with the big locking fixes
from upstream.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Conflicts:
	drivers/pinctrl/pinctrl-sunxi.c
2013-08-29 09:46:30 +02:00
..
core.c pinctrl: sh-pfc: remove unnecessary platform_set_drvdata() 2013-08-28 21:14:37 +02:00
core.h sh-pfc: Compute pin ranges automatically 2013-07-29 15:17:48 +02:00
gpio.c sh-pfc: Support pins not associated with a GPIO port 2013-07-29 15:17:49 +02:00
Kconfig sh-pfc: sh73a0: Add VCCQ MC0 regulator 2013-06-05 17:17:14 +09:00
Makefile sh-pfc: Add r8a7778 pinmux support 2013-06-04 21:04:02 +09:00
pfc-r8a73a4.c Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel 2013-07-29 16:33:57 +02:00
pfc-r8a7740.c Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel 2013-07-29 16:33:57 +02:00
pfc-r8a7778.c sh-pfc: Support pins not associated with a GPIO port 2013-07-29 15:17:49 +02:00
pfc-r8a7779.c Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel 2013-07-29 16:33:57 +02:00
pfc-r8a7790.c sh-pfc: r8a7790: Add DU pin groups and functions 2013-08-14 22:49:22 +02:00
pfc-sh73a0.c Linux 3.11-rc7 2013-08-29 09:46:30 +02:00
pfc-sh7203.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7264.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7269.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7372.c Merge branch 'pinmux/next/fixes' of git://linuxtv.org/pinchartl/fbdev into devel 2013-07-29 16:33:57 +02:00
pfc-sh7720.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7722.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7723.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7724.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7734.c sh-pfc: sh7734: Use the common GP port style macros 2013-07-29 15:17:44 +02:00
pfc-sh7757.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7785.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-sh7786.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pfc-shx3.c sh-pfc: Don't duplicate argument to PINMUX_GPIO macro 2013-07-29 15:17:45 +02:00
pinctrl.c pinctrl: Pass all configs to driver on pin_config_set() 2013-08-28 13:34:41 +02:00
sh_pfc.h sh-pfc: Support pins not associated with a GPIO port 2013-07-29 15:17:49 +02:00