Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes

This commit is contained in:
Russell King 2011-02-11 22:56:19 +00:00
commit e3329cba82
6 changed files with 12 additions and 8 deletions