Merge branch 'topic/fsi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 Jan 2013 21:55:33 +0000 (06:55 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 Jan 2013 21:55:33 +0000 (06:55 +0900)

Trivial merge