Merge branch 'master' into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 13 Jan 2012 15:00:22 +0000 (15:00 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 13 Jan 2012 15:00:22 +0000 (15:00 +0000)
commit4de3a8e101150feaefa1139611a50ff37467f33e
treedaada742542518b02d7db7c5d32e715eaa5f166d
parent294064f58953f9964e5945424b09c51800330a83
parent099469502f62fbe0d7e4f0b83a2f22538367f734
Merge branch 'master' into fixes
sound/soc/nuc900/nuc900-ac97.c