git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 304e6d5 78f28b7)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sun, 20 Sep 2009 12:55:36 +0000 (05:55 -0700)
Conflicts:
drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.


Trivial merge
Pandora Kernel Repository