]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 04:49:25 +0000 (14:49 +1000)
commitf15d7b46a62710be0f506d1ca4e0c03d82744c52
tree653179e64f923173f3fe23d25057351b981434db
parent27148c8e5fe7a1b82d1f63a04b033b139204b3a2
parent57d5b9c7a286840dc2b6b34ee868fd6b78e6a84b
Merge remote-tracking branch 'mfd/master'

Conflicts:
drivers/mfd/intel_msic.c
MAINTAINERS
drivers/mfd/Kconfig
drivers/mfd/intel_msic.c