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
..
accessibility
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
amba
ata	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2010-08-07 12:42:58 -07:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-09 21:05:52 -07:00
auxdisplay
base	drivers/base/node.c: reduce stack usage of node_read_meminfo()	2010-08-09 20:45:02 -07:00
block	Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2010-08-05 13:49:37 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
cdrom
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-09 21:05:52 -07:00
clocksource
connector
cpufreq
cpuidle	cpuidle: extend cpuidle and menu governor to handle dynamic states	2010-08-09 20:45:04 -07:00
crypto	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
dca
dio
dma	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-08-09 21:00:07 -07:00
edac
eisa
firewire
firmware	edd: fix possible memory leak in edd_init() error path	2010-08-09 20:45:09 -07:00
gpio	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
gpu	drm: fix fallouts from slow-work -> wq conversion	2010-08-09 12:18:44 +02:00
hid
hwmon	hwmon: f71882fg: add support for the Fintek F71808E	2010-08-09 20:45:10 -07:00
i2c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
ide	tx493xide: use min_t() macro instead of min()	2010-08-09 03:17:55 -07:00
idle
ieee1394
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-08-07 17:08:02 -07:00
input	Revert "Input: appletouch - fix integer overflow issue"	2010-08-09 13:48:08 +10:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-09 21:05:52 -07:00
leds	leds: Remove owner field from attribute initialization in bd2802 driver	2010-08-05 13:53:35 -07:00
lguest
macintosh	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 13:25:43 -07:00
mca
md
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-08-07 17:09:24 -07:00
memstick
message
mfd
misc	hmc6352: add driver for the HMC6352 compass	2010-08-09 20:45:10 -07:00
mmc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
mtd	Merge git://git.infradead.org/mtd-2.6	2010-08-10 11:49:21 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-09 21:05:52 -07:00
nubus
of
oprofile
parisc
parport	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
pci	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-08-09 21:00:07 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
platform
pnp
power	POWER: Add JZ4740 battery driver.	2010-08-05 13:26:20 +01:00
pps
ps3
rapidio
regulator	regulator: Remove owner field from attribute initialization in regulator core driver	2010-08-05 13:53:35 -07:00
rtc	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-08-05 08:53:20 -07:00
s390	s390: remove WARN_ON for misc_deregister() failures	2010-08-09 20:45:06 -07:00
sbus	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
serial	Merge branch 'rs485fix' of git://www.jni.nu/cris	2010-08-09 21:04:23 -07:00
sfi
sh
sn
spi
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
staging	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2010-08-10 11:26:52 -07:00
tc
telephony
thermal
uio	uio: Remove IRQF_DISABLED flag from uio_cif.c	2010-08-05 13:53:33 -07:00
usb	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
uwb
vhost
video	drivers/video/w100fb.c: ignore void return value / fix build failure	2010-08-09 20:44:53 -07:00
virtio
vlynq
w1
watchdog	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
xen	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 13:25:43 -07:00
zorro
Kconfig
Makefile