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-03-23 08:18:25 +00:00
commit 4f4669ee73
8 changed files with 26 additions and 26 deletions