Merge branch 'for-next/mtd'
Conflicts:
	drivers/mtd/core.c
	net/eth.c
commit e358922a74b01e6272c77caf01bc78a8295cc7d7
2 parents 9861578 + d5e38fc
@Sascha Hauer Sascha Hauer authored on 7 Mar 2014
Showing 11 changed files
View
drivers/base/driver.c
View
drivers/mtd/core.c
View
drivers/mtd/mtdoob.c
View
drivers/mtd/mtdraw.c
View
drivers/mtd/partition.c
View
drivers/mtd/ubi/build.c
View
drivers/mtd/ubi/cdev.c
View
drivers/mtd/ubi/vmt.c
View
fs/devfs-core.c
View
include/linux/mtd/mtd.h
View
net/eth.c