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 2009-11-16 20:59:25 +00:00
commit 112a674f2f
6 changed files with 9 additions and 6 deletions