Linus Torvalds 22ae77bc7a Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (53 commits) [MTD] struct device - replace bus_id with dev_name(), dev_set_name() [MTD] [NOR] Fixup for Numonyx M29W128 chips [MTD] mtdpart: Make ecc_stats more realistic. powerpc/85xx: TQM8548: Update DTS file for multi-chip support powerpc: NAND: FSL UPM: document new bindings [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays [MTD] [NAND] FSL-UPM: add multi chip support [MTD] [NOR] Add device parent info to physmap_of [MTD] [NAND] Add support for NAND on the Socrates board [MTD] [NAND] Add support for 4KiB pages. [MTD] sysfs support should not depend on CONFIG_PROC_FS [MTD] [NAND] Add parent info for CAFÉ controller [MTD] support driver model updates [MTD] driver model updates (part 2) [MTD] driver model updates [MTD] [NAND] move gen_nand's probe function to .devinit.text [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text [MTD] fix use after free in register_mtd_blktrans [MTD] [MAPS] Drop now unused sharpsl-flash map [MTD] ofpart: Check name property to determine partition nodes. ... Manually fix trivial conflict in drivers/mtd/maps/Makefile		2009-04-06 14:56:26 -07:00
..
dec
emma
fw
ip32
lasat
mach-au1x00	MIPS: Alchemy: provide cpu feature overrides.	2009-03-30 14:49:46 +02:00
mach-bcm47xx	bcm47xx: fix GPIO API return codes	2009-04-01 08:59:17 -07:00
mach-cavium-octeon	MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.	2009-01-11 09:57:21 +00:00
mach-cobalt
mach-db1x00
mach-dec
mach-emma2rh
mach-excite
mach-generic	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-ip22
mach-ip27	cpumask: remove node_to_first_cpu	2009-03-30 22:05:12 +10:30
mach-ip28
mach-ip32	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-jazz	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-lasat
mach-lemote	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-malta
mach-mipssim
mach-pb1x00
mach-pnx833x
mach-pnx8550
mach-rc32434	MIPS: RB532: Export rb532_gpio_set_func()	2009-01-30 21:33:01 +00:00
mach-rm
mach-sibyte
mach-tx39xx
mach-tx49xx
mach-vr41xx
mach-wrppmc
mach-yosemite
mips-boards	MIPS: Malta: make a needlessly global integer variable static	2009-03-30 14:49:45 +02:00
octeon	MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.	2009-01-11 09:57:21 +00:00
pci
pmc-sierra/msp71xx
sgi
sibyte
sn
txx9	[MTD] RBTX4939: add MTD support	2009-03-20 18:09:54 +00:00
vr41xx
xtalk
abi.h
addrspace.h
asm.h
asmmacro-32.h
asmmacro-64.h
asmmacro.h	MIPS: Use EI/DI for MIPS R2.	2008-12-12 18:12:23 +00:00
atomic.h	MIPS: atomic_*(): Change type of intermediate variables.	2009-01-30 21:32:57 +00:00
auxvec.h
barrier.h
bcache.h
bitops.h
bootinfo.h
branch.h
break.h
bug.h	MIPS: Make BUG() __noreturn.	2008-11-24 16:35:07 +00:00
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cachectl.h
cacheflush.h
cacheops.h
cevt-r4k.h
checksum.h
cmp.h
cmpxchg.h
compat-signal.h
compat.h	MIPS: compat: Implement is_compat_task.	2009-03-08 09:59:39 -07:00
compiler.h
cpu-features.h	MIPS: Hook Cavium OCTEON cache init into cache.c	2009-01-11 09:57:22 +00:00
cpu-info.h
cpu.h	MIPS: Alchemy: unify CPU model constants.	2009-03-30 14:49:45 +02:00
cputime.h
current.h
debug.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
ds1287.h
dsp.h
edac.h
elf.h	MIPS: Fix preprocessor warnings flaged by GCC 4.4	2008-12-22 08:54:47 +00:00
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap.h
floppy.h
fpregdef.h
fpu_emulator.h
fpu.h
ftrace.h	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
futex.h
gcmpregs.h
gic.h
gpio.h
gt64120.h
hardirq.h
hazards.h	MIPS: Alchemy: MIPS hazard workarounds are not required.	2009-03-30 14:49:46 +02:00
highmem.h
hw_irq.h
i8253.h
i8259.h
ide.h
inst.h
io.h	MIPS: Modify core io.h macros to account for the Octeon Errata Core-301.	2009-01-11 09:57:22 +00:00
ioctl.h
ioctls.h
ipcbuf.h
irq_cpu.h
irq_gt641xx.h
irq_regs.h
irq.h	irq: update all arches for new irq_desc	2009-01-12 15:27:13 -08:00
irqflags.h
isadep.h
jazz.h
jazzdma.h
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h
kexec.h
kgdb.h
kmap_types.h
kspd.h
linkage.h
local.h
m48t37.h
mc146818-time.h
mc146818rtc.h
mips_mt.h
mipsmtregs.h
mipsprom.h
mipsregs.h	MIPS: Change {set,clear,change}_c0_<foo> to return old value.	2009-03-23 23:38:05 +01:00
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h	MIPS: Add Cavium OCTEON processor constants and CPU probe.	2009-01-11 09:57:22 +00:00
msc01_ic.h
msgbuf.h
mutex.h
nile4.h
paccess.h
page.h
param.h
parport.h
pci.h	MIPS: Better than nothing implementation of PCI mmap to fix X.	2008-12-09 21:55:43 +00:00
percpu.h
pgalloc.h
pgtable-32.h
pgtable-64.h
pgtable-bits.h
pgtable.h
pmon.h
poll.h
posix_types.h
prefetch.h	MIPS: NEC VR5500 processor support fixup	2009-03-11 21:11:07 +01:00
processor.h	MIPS: Add Cavium OCTEON cop2/cvmseg state entries to processor.h.	2009-01-11 09:57:22 +00:00
ptrace.h	MIPS: Fix a typo in watchpoint register structure.	2009-01-30 21:32:58 +00:00
r4k-timer.h
r4kcache.h
reboot.h
reg.h
regdef.h
resource.h
rm9k-ocd.h
rtlx.h
scatterlist.h
seccomp.h	MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled	2009-03-13 23:07:59 +01:00
sections.h
segment.h
sembuf.h
serial.h
setup.h
sgialib.h
sgiarcs.h
sgidefs.h
shmbuf.h
shmparam.h
sigcontext.h	headers_check fix: mips, sigcontext.h	2009-02-01 11:01:26 +05:30
siginfo.h
signal.h
sim.h
smp-ops.h	MIPS: Forward declare struct task_struct to avoid potencial warning.	2009-03-30 14:49:39 +02:00
smp.h	MIPS: Add SMP_ICACHE_FLUSH for the Cavium CPU family.	2009-01-11 09:57:24 +00:00
smtc_ipi.h
smtc_proc.h
smtc.h
smvp.h
sni.h
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	Allow rwlocks to re-enable interrupts	2009-04-02 19:05:11 -07:00
stackframe.h	MIPS: Cavium OCTEON multiplier state preservation.	2009-01-11 09:57:24 +00:00
stacktrace.h
stat.h
statfs.h
string.h
suspend.h
swab.h	headers_check fix: mips, swab.h	2009-02-01 11:01:27 +05:30
sysmips.h
system.h
termbits.h
termios.h	MIPS: Add return value checks to user_termio_to_kernel_termios()	2009-01-30 21:32:57 +00:00
thread_info.h	MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled	2009-03-13 23:07:59 +01:00
time.h	MIPS: make cp0 counter clocksource/event usable as fallback.	2009-01-11 09:57:26 +00:00
timex.h
titan_dep.h
tlb.h
tlbdebug.h
tlbflush.h
topology.h
traps.h
txx9irq.h
txx9pio.h
txx9tmr.h
types.h	MIPS: Stop using <asm-generic/int-l64.h>.	2009-03-30 14:49:41 +02:00
uaccess.h
ucontext.h
unaligned.h
unistd.h	preadv/pwritev: MIPS: Add preadv(2) and pwritev(2) syscalls.	2009-04-02 19:05:08 -07:00
user.h
vga.h
vpe.h
war.h
watch.h
wbflush.h
xor.h