git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36cd4fb 10fec20)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 12 Aug 2008 10:28:00 +0000 (11:28 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 12 Aug 2008 10:28:00 +0000 (11:28 +0100)
Conflicts:

include/asm-arm/arch-omap/onenand.h


Trivial merge
Pandora Kernel Repository