git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57f7baf d384e35)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 22 Jan 2008 19:56:40 +0000 (11:56 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 22 Jan 2008 19:56:40 +0000 (11:56 -0800)
Merge branches 'master' and 'linus'

Conflicts:

arch/arm/Kconfig


Trivial merge
Pandora Kernel Repository