]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dt-rh/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:12:10 +0000 (15:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:12:10 +0000 (15:12 +1000)
commite2cc471e025ba9bb18c0309b5bd28266cbce4bc3
tree3bf8c3fd9ed438488a0651b403580625f6a0a4c3
parent484ab6b5bfc4d0ff3bb898bd9d0aacab81517e55
parent36165f55055781a0e4bf32d775241796414504b0
Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
drivers/of/base.c
include/linux/of.h
MAINTAINERS
drivers/of/base.c
drivers/spi/spi-s3c64xx.c
include/linux/of.h