original_kernel/drivers/mtd/nand
David Woodhouse ffe3150125 UAPI Disintegration 2012-10-09
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUHPmWhOxKuMESys7AQLCZRAAsZAuAK0MxZ4iuq/+fmy7Uxb1jrzLOYSb
 3UgbTgXAjR0WAUHNegVZLX1Xc+12KxvMCj/8sO62Ai+wtgHeDAuUl2T0FbSZjlGK
 qqx/qQqTFHUfJRbm3Lu9iarZ2K49v1kTDk4C+nC8J9mEEW4WFlVPD10n90j+4hxr
 ZCEYril7qOQQV65oor3BT2V64+X1WDHriTLugH1o8RziRF9jh6Z2hgZAWnThcGxu
 lPsmXF2e7jDqGcM3gWtxZWu/yTBPxw549R+JUg4aVKho9WI5ClyjNAKnE7wtd3iW
 HyrylRH+ch2oeYFa5+xoyopRARUUPmujKaHU+ZI1o++eNzuw5JYiwuMlZBLyUc9I
 foWMSUw31U7695exyf66HiH7GEKI1PVpgJVNu41eJvl0iWSWCpKCB6Gs8Sw4xnp2
 auUCYSniXHNTFhFktjNdIUAn0+1X/b/SEfb/id4GvLp1K98QGOfe8dMCC8hEnXiF
 4iIViM8Sv1GB1us5huSjbMeRPbZ3x/loqEpApfgcaqcyrUR29FTE/lFQ4fj9xviL
 JjckPLMMZb4Ho5wrkCi5NtXJ16mx1qKzbBGDdqzmqaNdN+08rNF//kA9m9hCwgD8
 XfAV286DKDC0SllZIG+Uz7YLnSZjNAUhjvWN3ipV+SdT5DGybL3uSW5tYiSAzI2E
 3cayGTWINMg=
 =U9Qq
 -----END PGP SIGNATURE-----

Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c
2012-10-09 15:04:25 +01:00
..
gpmi-nand
Kconfig
Makefile
alauda.c
ams-delta.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
atmel_nand.c
atmel_nand_ecc.h
au1550nd.c
autcpu12.c
bf5xx_nand.c
cafe_nand.c
cmx270_nand.c
cs553x_nand.c
davinci_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
denali.c
denali.h
diskonchip.c
docg4.c
fsl_elbc_nand.c
fsl_ifc_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
fsl_upm.c
fsmc_nand.c
gpio.c
h1910.c
jz4740_nand.c
lpc32xx_mlc.c
lpc32xx_slc.c
mpc5121_nfc.c
mxc_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
nand_base.c
nand_bbt.c
nand_bch.c
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c
nomadik_nand.c
nuc900_nand.c
omap2.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
orion_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
r852.c
r852.h
rtc_from4.c
s3c2410.c UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c
spia.c
tmio_nand.c
txx9ndfmc.c
xway_nand.c