]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcf690a 87eb832)
Merge tag 'ib-mfd-mtd-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
authorCyrille Pitchen <cyrille.pitchen@atmel.com>
Fri, 10 Feb 2017 13:03:03 +0000 (14:03 +0100)
committerCyrille Pitchen <cyrille.pitchen@atmel.com>
Fri, 10 Feb 2017 13:06:47 +0000 (14:06 +0100)
From Lee Jones:

"""
Immutable branch between MFD and MTD due for the v4.11 merge window
"""

1  2 
drivers/mtd/spi-nor/Kconfig patch | diff1 | diff2 | blob | history
drivers/mtd/spi-nor/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/spi-nor/Kconfig
Simple merge
diff --cc drivers/mtd/spi-nor/Makefile
Simple merge
local clone of linux.git