| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Mon May 10 14:32:46 2010 +0100 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Mon May 10 14:32:46 2010 +0100 |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 [diff] | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 [diff] |
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.