kernel-fxtec-pro1x/drivers/staging
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
..
asus_oled
bcm
comedi
cptm1217
crystalhd
cxt1e1 staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
echo
et131x
frontier
ft1000
gma500 staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
hv
iio Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
intel_sst staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
keucr
line6 staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
media Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
mei
nvec
octeon
olpc_dcon
panel
phison
pohmelfs filesystems: add set_nlink() 2011-11-02 12:53:43 +01:00
quatech_usb2
quickstart
rtl8187se
rtl8192e
rtl8192u
rtl8712
rts5139 staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
rts_pstor
sbe-2t3e3
sep
serial
serqt_usb2
slicoss
sm7xx
speakup
spectra Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
ste_rmi4
tidspbridge
usbip staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
vme
vt6655
vt6656
winbond staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
wlags49_h2 staging: Add module.h to more drivers implicitly using it. 2011-10-31 19:32:10 -04:00
wlags49_h25
wlan-ng
xgifb Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2011-10-30 15:30:01 -07:00
zcache
zram Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block 2011-11-04 17:06:58 -07:00
Kconfig staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
Makefile staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
staging.c