git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 565b44c 48ec206)
Merge remote-tracking branch 'unicore32/unicore32'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:41:40 +0000 (11:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:41:40 +0000 (11:41 +1000)
Conflicts:
drivers/rtc/Kconfig


Trivial merge
Pandora Kernel Repository