summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max77693.c
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2013-07-31 14:24:06 -0700
committerRoland Dreier <roland@purestorage.com>2013-07-31 14:24:06 -0700
commit569935db80fd5338005d977ffc3428d43aad84ba (patch)
tree2993c3ee664d5e86303498b3784acdcf3eeccc48 /drivers/mfd/max77693.c
parent5eb695c1773b439fb668127d3738d348a46a2748 (diff)
parent246fcdbc9d6c7ee1b12e299427efbc2ab49e40b5 (diff)
parentae1fe07f3f422c62a0baf6a777141d7110e8a111 (diff)
parentc2904141696ee19551f1553944446f23cdd5d95e (diff)
parentef5ed4166ffc192434a9d7324339ed1d308fc2dc (diff)
parent3eac103f83ab0c2013b734981d92d56be51a1a9c (diff)
parent618af3846be1d29118b00529e68971e8c95d5b72 (diff)
parent3c93f039d29326954b2c503a71e1eab9ae49063b (diff)
parent63ea37495714849a5a7986244d9d656e0af14961 (diff)
parentb268e4db3d04ed83ecc76b0454b12a8884445f88 (diff)
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma' and 'qib' into for-next