Files
rockchip-kernel/include/linux
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-11-07 09:11:16 -08:00
2011-03-31 11:26:23 -03:00
2011-07-22 08:25:37 -07:00
2011-11-02 16:07:03 -07:00
2011-07-20 20:47:43 -04:00
2011-07-26 16:49:47 -07:00
2011-10-26 15:43:25 -04:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-08-03 11:30:42 -04:00
2011-07-31 22:05:09 +02:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-05-26 17:12:34 -07:00
2011-09-27 09:25:02 +01:00
2011-03-31 11:26:23 -03:00
2011-10-31 17:30:44 -07:00
2011-07-26 16:49:47 -07:00
2011-08-25 16:25:33 -07:00
2011-03-31 11:26:23 -03:00
2011-07-06 14:44:42 -07:00
2011-07-25 20:57:16 -07:00
2011-11-02 12:53:43 +01:00
2011-07-05 23:42:17 -07:00
2011-07-26 16:49:47 -07:00
2011-10-02 00:19:34 +02:00
2011-05-23 10:47:06 -05:00
2011-05-29 13:03:09 +01:00
2011-10-31 20:19:04 +00:00
2011-05-24 10:21:29 +02:00
2011-03-31 11:26:23 -03:00
2011-09-14 15:24:51 -04:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-08-08 16:08:08 +02:00
2011-07-01 15:34:45 -07:00
2011-03-31 11:26:23 -03:00
2011-06-28 10:48:34 +02:00
2011-03-31 11:26:23 -03:00
2011-07-01 10:37:15 +02:00
2011-05-08 16:41:45 -07:00
2011-10-30 04:43:30 -04:00
2011-07-21 13:47:54 -07:00
2011-09-27 18:08:04 +02:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2011-09-25 19:52:59 +03:00
2011-10-30 12:24:05 +02:00
2011-09-16 19:20:20 -04:00
2011-05-24 14:33:35 +02:00
2011-04-25 18:14:10 -07:00
2011-11-02 16:06:57 -07:00
2011-11-02 16:06:58 -07:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-10-31 11:51:28 -04:00
2011-07-31 12:18:16 -04:00
2011-07-28 16:19:22 -06:00
2011-10-31 14:03:22 +01:00
2011-03-31 11:26:23 -03:00
2011-05-26 17:12:37 -07:00
2011-03-31 11:26:23 -03:00
2011-11-02 16:07:02 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-05-25 08:39:19 -07:00
2011-07-26 14:50:01 -07:00
2011-06-07 10:02:35 +02:00
2011-10-28 15:03:52 +09:00
2011-07-30 08:44:19 -10:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-07-25 20:57:11 -07:00
2011-10-31 17:30:47 -07:00
2011-08-16 00:16:49 -07:00
2011-08-03 14:25:22 -10:00
2011-10-31 17:30:44 -07:00
2011-11-02 16:07:02 -07:00
2011-10-03 14:01:21 -04:00
2011-06-27 20:30:08 +02:00
2011-08-23 10:10:38 -07:00
2011-03-31 11:26:23 -03:00
2011-06-07 09:05:42 -07:00
2011-11-02 16:07:02 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2011-09-14 15:24:51 -04:00
2011-03-31 11:26:23 -03:00