diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 07:37:42 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 07:37:42 -0500 |
| commit | 15086ded21ee7f065ad290c1edfdc49cf18cf96e (patch) | |
| tree | 97b509b33d08a83dcd93406acfeccde4f2843ba5 /usr/.gitignore | |
| parent | 3e5ff4dfa5a0a5627235a245665035597f050d86 (diff) | |
| parent | 28e868081086c495c897a48c50d2d5187ef677d2 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Conflicts:
sound/soc/codecs/wm8978.c
sound/soc/soc-dapm.c
Diffstat (limited to 'usr/.gitignore')
0 files changed, 0 insertions, 0 deletions