]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:07:57 +0000 (13:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 03:07:57 +0000 (13:07 +1000)
commite8735f971ff30c052644b22ec23cdd4b0a3b3e68
tree315d08dfc6b64357595b09b555f0f2ee2934ceb2
parentcde7aec5f271cb3a07cf15152388381031127ee9
parentc00ba41cffe6ec57182b4217f82db75549a4d35c
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/mfd/asic3.c
MAINTAINERS