]> git.karo-electronics.de Git - mv-sheeva.git/commit - fs/exofs/inode.c
Merge branch 'for-2.6.37' into HEAD
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 2 Nov 2010 13:58:49 +0000 (09:58 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 2 Nov 2010 13:58:49 +0000 (09:58 -0400)
commit9e3be1edbe5ca57df51140b523168237b3a01f4d
treea72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d
parent473f89fff76568a9f30c53b458e6323d48b0ab95
parent29c798fecb9b846b363b0a02fa662ff42fc19426
Merge branch 'for-2.6.37' into HEAD

WARN() fix from Joe moved.

Conflicts:
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c