tree 4f449d929b5df9e126e839f388ff0fd2b52028a0
parent 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5
parent b57f95a38233a2e73b679bea4a5453a1cc2a1cc9
author David Woodhouse <David.Woodhouse@intel.com> 1273498366 +0100
committer David Woodhouse <David.Woodhouse@intel.com> 1273498366 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/mtdcore.c

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