Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Some manual fixups for clashing kfree() cleanups etc.
Showing
- drivers/mtd/Kconfig 26 additions, 14 deletionsdrivers/mtd/Kconfig
- drivers/mtd/Makefile 3 additions, 2 deletionsdrivers/mtd/Makefile
- drivers/mtd/afs.c 8 additions, 8 deletionsdrivers/mtd/afs.c
- drivers/mtd/chips/Kconfig 11 additions, 11 deletionsdrivers/mtd/chips/Kconfig
- drivers/mtd/chips/Makefile 2 additions, 2 deletionsdrivers/mtd/chips/Makefile
- drivers/mtd/chips/amd_flash.c 40 additions, 40 deletionsdrivers/mtd/chips/amd_flash.c
- drivers/mtd/chips/cfi_cmdset_0001.c 289 additions, 195 deletionsdrivers/mtd/chips/cfi_cmdset_0001.c
- drivers/mtd/chips/cfi_cmdset_0002.c 83 additions, 73 deletionsdrivers/mtd/chips/cfi_cmdset_0002.c
- drivers/mtd/chips/cfi_cmdset_0020.c 96 additions, 87 deletionsdrivers/mtd/chips/cfi_cmdset_0020.c
- drivers/mtd/chips/cfi_probe.c 49 additions, 49 deletionsdrivers/mtd/chips/cfi_probe.c
- drivers/mtd/chips/cfi_util.c 8 additions, 17 deletionsdrivers/mtd/chips/cfi_util.c
- drivers/mtd/chips/chipreg.c 3 additions, 3 deletionsdrivers/mtd/chips/chipreg.c
- drivers/mtd/chips/fwh_lock.h 3 additions, 3 deletionsdrivers/mtd/chips/fwh_lock.h
- drivers/mtd/chips/gen_probe.c 17 additions, 16 deletionsdrivers/mtd/chips/gen_probe.c
- drivers/mtd/chips/jedec.c 103 additions, 103 deletionsdrivers/mtd/chips/jedec.c
- drivers/mtd/chips/jedec_probe.c 24 additions, 24 deletionsdrivers/mtd/chips/jedec_probe.c
- drivers/mtd/chips/map_absent.c 4 additions, 4 deletionsdrivers/mtd/chips/map_absent.c
- drivers/mtd/chips/sharp.c 11 additions, 12 deletionsdrivers/mtd/chips/sharp.c
- drivers/mtd/cmdlinepart.c 28 additions, 28 deletionsdrivers/mtd/cmdlinepart.c
- drivers/mtd/devices/Kconfig 4 additions, 4 deletionsdrivers/mtd/devices/Kconfig
Loading
Please register or sign in to comment