git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cedb87 9824986)
Merge remote-tracking branch 'galak/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:41:34 +0000 (11:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:41:34 +0000 (11:41 +1000)
Conflicts:
arch/powerpc/boot/dts/p2020ds.dts
arch/powerpc/boot/dts/p2020rdb.dts


Trivial merge
Pandora Kernel Repository