git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5406b26 384703b)
Merge branch 'linus' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 20 Dec 2011 00:50:13 +0000 (16:50 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 20 Dec 2011 00:50:13 +0000 (16:50 -0800)
Conflicts:
arch/arm/kernel/setup.c


Trivial merge
Pandora Kernel Repository