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

This commit is contained in:
Russell King 2010-07-21 09:26:37 +01:00
commit 52d90145fb
7 changed files with 12 additions and 16 deletions