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
..
ABI	Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block	2011-11-04 17:22:14 -07:00
DocBook	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
PCI	…
RCU	…
accounting	…
acpi	…
aoe	…
arm	…
auxdisplay	…
blackfin	…
block	Documentation: drop as block elevator reference in switching-sched.txt	2011-11-04 12:01:48 -07:00
blockdev	…
cdrom	…
cgroups	Documentation: update cgroups notes	2011-11-04 12:01:46 -07:00
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	…
device-mapper	dm log userspace: fix comment hyphens	2011-10-31 20:21:22 +00:00
devicetree	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
driver-model	…
dvb	…
early-userspace	…
fault-injection	fault-injection: update documentation with the mmc module param	2011-10-26 16:32:13 -04:00
fb	…
filesystems	Documentation: HFS is orphaned	2011-11-04 12:01:48 -07:00
firmware_class	…
frv	…
hid	…
hwmon	hwmon: (w83627ehf) Add support for the W83627UHG	2011-11-04 12:00:48 +01:00
i2c	i2c: Functions for byte-swapped smbus_write/read_word_data	2011-10-30 13:47:25 +01:00
i2o	…
ia64	…
ide	…
infiniband	…
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-10-27 08:44:20 +02:00
ioctl	…
isdn	…
ja_JP	…
kbuild	…
kdump	…
ko_KR	…
laptops	Documentation: thinkpad-acpi grammo fixes	2011-11-04 12:01:47 -07:00
leds	Documentation: fix leds-class.txt duplicated word	2011-11-04 12:01:48 -07:00
m68k	…
make	…
mips	…
misc-devices	…
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	ipvs: Enhance grammar used to refer to Kconfig options	2011-11-01 09:19:45 +01:00
nfc	…
parisc	…
pcmcia	…
power	PM / Runtime: Automatically retry failed autosuspends	2011-11-04 22:28:14 +01:00
powerpc	…
pps	…
prctl	…
pti	…
ptp	…
rapidio	RapidIO: documentation update	2011-11-02 16:07:02 -07:00
s390	…
scheduler	…
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
security	…
serial	Documentation: Computone ip2 is orphaned	2011-11-04 12:01:48 -07:00
sh	…
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	2011-10-28 14:25:01 -07:00
sparc	…
spi	…
sysctl	kernel/sysctl.c: add cap_last_cap to /proc/sys/kernel	2011-10-31 17:30:53 -07:00
target	…
telephony	…
thermal	…
timers	…
trace	mm: change isolate mode from #define to bitwise type	2011-10-31 17:30:44 -07:00
usb	…
vDSO	…
video4linux	…
virtual	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
vm	Merge branches 'slab/next' and 'slub/partial' into slab/for-linus	2011-10-26 18:09:12 +03:00
w1	…
watchdog	Documentation: watchdog: add guide how to convert drivers to new framework	2011-11-05 21:25:16 +01:00
wimax	…
x86	…
zh_CN	…
.gitignore	…
00-INDEX	…
BUG-HUNTING	…
Changes	…
CodingStyle	Documentation: update CodingStyle use of braces	2011-11-04 12:01:47 -07:00
DMA-API-HOWTO.txt	…
DMA-API.txt	include/linux/dma-mapping.h: add dma_zalloc_coherent()	2011-11-02 16:07:02 -07:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	…
IPMI.txt	…
IRQ-affinity.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
coccinelle.txt	…
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
dmaengine.txt	…
dontdiff	…
dynamic-debug-howto.txt	…
edac.txt	…
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	sysctl: make CONFIG_SYSCTL_SYSCALL default to n	2011-11-02 16:07:02 -07:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'akpm' (Andrew's incoming)	2011-10-31 17:46:07 -07:00
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	…
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
mca.txt	…
md.txt	…
media-framework.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	…
mutex-design.txt	…
nmi_watchdog.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree	2011-11-07 07:54:42 +10:30
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
pi-futex.txt	…
pinctrl.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
prio_tree.txt	…
ramoops.txt	…
rbtree.txt	…
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	…
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xz.txt	…
zorro.txt	…