| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Sat Oct 30 12:35:11 2010 +0100 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Sat Oct 30 12:35:11 2010 +0100 |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 [diff] | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>