diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 23:04:55 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 23:04:55 -0400 |
| commit | 8a41fb22ceda3c531416246f7cae457aacaff7b4 (patch) | |
| tree | a652698b778d8396fa68912603794c108c5deff0 /drivers/mfd/twl6030-irq.c | |
| parent | 9b0072e2731ba2f7c702a900a0cd19a137feeb10 (diff) | |
| parent | 10a8c3839810ac9af1aec836d61b92e7a879f5fa (diff) | |
Merge commit '10a8c38' (rmk/misc branch) into linaro-2.6.38
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/mfd/twl6030-irq.c')
0 files changed, 0 insertions, 0 deletions