diff options
| author | Roland Dreier <roland@purestorage.com> | 2012-10-04 19:12:22 -0700 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-10-04 19:12:22 -0700 |
| commit | 56040f07b26bb32f4b70ec2192ecddeb6cef3754 (patch) | |
| tree | 20755ae79321d67c96ddc0f3aa146bff26d1fc75 /drivers/power/charger-manager.c | |
| parent | 4ede178a5eb55fe70070fcd0960b58ba6a5643a8 (diff) | |
| parent | 71d9c5f9e60846fa40c9efadda122d9cf275c1d2 (diff) | |
| parent | 5a33a6694942bc86e487d00cd8feebeae5f14546 (diff) | |
| parent | 60396683fe863b3bc3ec22e9243dc2e76de601dd (diff) | |
| parent | cf9fd75cbccde47c205c3d0202ad674d6bc00ee2 (diff) | |
Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next