]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 02:34:05 +0000 (12:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 02:34:05 +0000 (12:34 +1000)
commit7afd12e9202e9bef6a9a63f4e1d5f2a8795f651d
treea85128daa9a1c0b16fad9398d0c478bf0cbd7af1
parent066f0a9737545ecc0c1e926e321706eef13e6006
parent43d61ee4efe350836f3037de53475975dcbd92eb
Merge remote-tracking branch 'mfd/master'

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