diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 14:14:47 +0000 |
| commit | 0afc8c733e95642ee9200966081da82564af8f8f (patch) | |
| tree | 01dfd20489e9cec42f43bc0588cf82989fcc132e /tools | |
| parent | 0d735eaa2c1d80c997fd775b679e36b80b8e85d1 (diff) | |
| parent | 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
include/linux/mfd/wm8994/pdata.h
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions