diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-24 17:16:17 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-24 17:16:17 +0200 |
| commit | 6e1ff8e78958e5ea6871dca4a5ef6076fadcbcc1 (patch) | |
| tree | 4e17c48118edbe073b49341d95809a8e0b2a8f80 /include/linux/mfd/wm831x | |
| parent | ed6e65a66f3bcf84dff4ff4e680096b7e40076d5 (diff) | |
| parent | 09f333ed6069575a71fabc999c4dc39b6594d727 (diff) | |
Merge remote-tracking branch 'armlt/3.3-armlt-gator-5.10' into stable-linux-ux500-3.3ubuntu-release-12-07ubuntu-release-12-06
Conflicts:
drivers/Kconfig
Diffstat (limited to 'include/linux/mfd/wm831x')
0 files changed, 0 insertions, 0 deletions