git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f1f3d0 b57f95a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
Conflicts:
drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.


Trivial merge
Pandora Kernel Repository