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

This commit is contained in:
Russell King 2011-01-15 12:39:04 +00:00
commit 073154459b
7 changed files with 24 additions and 37 deletions