]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:47:19 +0000 (15:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:47:19 +0000 (15:47 +1000)
commitc18f89fa54f73063bfafa3667314b1a4b4ef6b85
treebf28da6ebf450cd4d00fa7ef1f0b8547aa848673
parent35b129aa7192fb5e92929aede9504b29a0f2ff4a
parenta5d811bbf1c6df86cfe23948059ea614554b9f19
Merge remote-tracking branch 'pinctrl/for-next'

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