| commit | 31d7aafd6193ba2a181743d3bb7daf7453cadd42 | [log] [tgz] |
|---|---|---|
| author | Samuel Ortiz <sameo@linux.intel.com> | Mon May 06 00:30:18 2013 +0200 |
| committer | Samuel Ortiz <sameo@linux.intel.com> | Mon May 06 00:30:18 2013 +0200 |
| tree | bd8c835cba10a91f182fe8ea3db19ad683c4f56b | |
| parent | 534c97b0950b1967bca1c753aeaed32f5db40264 [diff] | |
| parent | 99f4c6b66a9ae362d21e6df95d04bc74e04d285e [diff] |
Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next into mfd-3.10-merge Conflicts: drivers/mfd/Kconfig