commit | 257dab81413b31b8648becfe11586b3a41e5c29a | [log] [tgz] |
---|---|---|
author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu May 06 08:16:34 2010 +0100 |
committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu May 06 08:16:34 2010 +0100 |
tree | 6f407983f0a37dd250d0014b990bbf118df57e34 | |
parent | ea056df7965fc46cfff28fd3808bf3ada23d5059 [diff] | |
parent | ccb8d8d070b8f25f0163da5c9ceacf63a5169540 [diff] |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6