| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Tue Oct 09 15:03:21 2012 +0100 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Tue Oct 09 15:04:25 2012 +0100 |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 [diff] | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 [diff] |
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