leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a6207b17ec
linux/drivers/mtd/ubi
History
Linus Torvalds 29a6ccca38 Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (97 commits)
  mtd: kill CONFIG_MTD_PARTITIONS
  mtd: remove add_mtd_partitions, add_mtd_device and friends
  mtd: convert remaining users to mtd_device_register()
  mtd: samsung onenand: convert to mtd_device_register()
  mtd: omap2 onenand: convert to mtd_device_register()
  mtd: txx9ndfmc: convert to mtd_device_register()
  mtd: tmio_nand: convert to mtd_device_register()
  mtd: socrates_nand: convert to mtd_device_register()
  mtd: sharpsl: convert to mtd_device_register()
  mtd: s3c2410 nand: convert to mtd_device_register()
  mtd: ppchameleonevb: convert to mtd_device_register()
  mtd: orion_nand: convert to mtd_device_register()
  mtd: omap2: convert to mtd_device_register()
  mtd: nomadik_nand: convert to mtd_device_register()
  mtd: ndfc: convert to mtd_device_register()
  mtd: mxc_nand: convert to mtd_device_register()
  mtd: mpc5121_nfc: convert to mtd_device_register()
  mtd: jz4740_nand: convert to mtd_device_register()
  mtd: h1910: convert to mtd_device_register()
  mtd: fsmc_nand: convert to mtd_device_register()
  ...

Fixed up trivial conflicts in
 - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
 - drivers/mtd/maps/physmap.c: addition of afs partition probe type
   clashing with removal of CONFIG_MTD_PARTITIONS
2011-05-27 20:06:53 -07:00
..
build.c Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 2011-03-18 10:50:27 -07:00
cdev.c UBI: fix minor stylistic issues 2011-04-14 11:34:41 +03:00
debug.c UBI: switch to dynamic printks 2011-05-20 08:30:34 +03:00
debug.h UBI: switch to dynamic printks 2011-05-20 08:30:34 +03:00
eba.c
gluebi.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
io.c UBI: fix typo in a message 2011-04-14 13:38:59 +03:00
kapi.c UBI: provide LEB offset information 2011-03-08 10:12:48 +02:00
Kconfig UBI: do not select KALLSYMS_ALL 2011-04-05 11:08:59 +03:00
Makefile
misc.c
scan.c UBI: fix minor stylistic issues 2011-04-14 11:34:41 +03:00
scan.h UBI: add slab cache for ubi_scan_leb objects 2011-02-06 19:19:23 +02:00
ubi-media.h UBI: use __packed instead of __attribute__((packed)) 2011-04-14 11:34:41 +03:00
ubi.h UBI: fix minor stylistic issues 2011-04-14 11:34:41 +03:00
upd.c
vmt.c UBI: do not compare array with NULL 2011-04-05 11:08:58 +03:00
vtbl.c Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 2011-03-18 10:50:02 -07:00
wl.c UBI: fix minor stylistic issues 2011-04-14 11:34:41 +03:00