diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
| commit | 9e3be1edbe5ca57df51140b523168237b3a01f4d (patch) | |
| tree | a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d /include/linux/spi/sh_msiof.h | |
| parent | 473f89fff76568a9f30c53b458e6323d48b0ab95 (diff) | |
| parent | 29c798fecb9b846b363b0a02fa662ff42fc19426 (diff) | |
Merge branch 'for-2.6.37' into HEAD
WARN() fix from Joe moved.
Conflicts:
sound/soc/codecs/wm_hubs.c
Diffstat (limited to 'include/linux/spi/sh_msiof.h')
0 files changed, 0 insertions, 0 deletions