Merge branch 'ads117x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorMark Brown <[email protected]>
Fri, 20 Nov 2009 16:37:10 +0000 (16:37 +0000)
committerMark Brown <[email protected]>
Fri, 20 Nov 2009 16:37:10 +0000 (16:37 +0000)

Trivial merge