git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6fe4c59 51f00a4)

author	David Woodhouse <David.Woodhouse@intel.com>
	Sat, 30 Oct 2010 11:35:11 +0000 (12:35 +0100)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Sat, 30 Oct 2010 11:35:11 +0000 (12:35 +0100)
commit	67577927e8d7a1f4b09b4992df640eadc6aacb36
tree	2e9efe6b5745965faf0dcc084d4613d9356263f9	tree \| snapshot (tar.gz zip)
parent	6fe4c590313133ebd5dadb769031489ff178ece1	commit \| diff
parent	51f00a471ce8f359627dd99aeac322947a0e491b	commit \| diff

Merge branch 'master' of git://git./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>

arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/chips/cfi_cmdset_0002.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/m25p80.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/pcmciamtd.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtd_blkdevs.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdchar.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
fs/jffs2/fs.c	diff1 \|	diff2 \|	blob \| history