Linus Torvalds e8a89cebdb Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (79 commits) mtd: Remove obsolete <mtd/compatmac.h> include mtd: Update copyright notices jffs2: Update copyright notices mtd-physmap: add support users can assign the probe type in board files mtd: remove redwood map driver mxc_nand: Add v3 (i.MX51) Support mxc_nand: support 8bit ecc mxc_nand: fix correct_data function mxc_nand: add V1_V2 namespace to registers mxc_nand: factor out a check_int function mxc_nand: make some internally used functions overwriteable mxc_nand: rework get_dev_status mxc_nand: remove 0xe00 offset from registers mtd: denali: Add multi connected NAND support mtd: denali: Remove set_ecc_config function mtd: denali: Remove unuseful code in get_xx_nand_para functions mtd: denali: Remove device_info_tag structure mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips ... Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to redwood driver removal.		2010-08-10 11:49:21 -07:00
..
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-08-07 17:08:30 -07:00
asm-generic	Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify	2010-08-10 11:39:13 -07:00
crypto
drm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2010-08-07 12:42:58 -07:00
keys	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
linux	Merge git://git.infradead.org/mtd-2.6	2010-08-10 11:49:21 -07:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: dib0700: break keytable into NEC and RC-5 variants	2010-08-02 16:43:49 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-08-06 13:30:43 -07:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma	IB: Rename RAW_ETY to RAW_ETHERTYPE	2010-08-04 10:44:19 -07:00
rxrpc
scsi	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-07 17:07:31 -07:00
trace	memcg: add mm_vmscan_memcg_isolate tracepoint	2010-08-09 20:45:03 -07:00
video
xen	x86: Call HVMOP_pagetable_dying on exit_mmap.	2010-07-26 23:13:26 -07:00
Kbuild