]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:42:29 +0000 (15:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 05:42:29 +0000 (15:42 +1000)
commit22e1276f1f904eee301446d5fe214b449c759cb9
tree922f766daf174de35607f70f584d60e0465cce39
parent16e37de50d1cb77ac74c86c4dfad19cd3ce0b6ef
parent5b81d55c4ccf23b9de398f819571dfc8941c7b04
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
drivers/net/ethernet/ti/davinci_mdio.c
drivers/pinctrl/Makefile
Documentation/pinctrl.txt
MAINTAINERS
drivers/i2c/busses/i2c-nomadik.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/davinci_mdio.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/spi/spi-pl022.c
drivers/tty/serial/amba-pl011.c