]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:10:53 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:10:53 +0000 (11:10 +1000)
commit32d17f73f36c0928b942cecc56244e4d3cad410e
treebc6f5e4b6685d93b31d8e3d588e6a543802abcc1
parentdeb614103499d5f9c856cf83623e6adedf8f9d63
parent97541ccfb9db2bb9cd1dde6344d5834438d14bda
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Makefile
drivers/net/ethernet/octeon/octeon_mgmt.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile