You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 623ff7739e MTD merge for 3.4 ... Artem's cleanup of the MTD API continues apace. Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst others. More work on DiskOnChip G3, new driver for DiskOnChip G4. Clean up debug/warning printks in JFFS2 to use pr_<level>. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAk92K6UACgkQdwG7hYl686NrMACfWQJRWasR78MWKfkT2vWZwTFJ X5AAoKiSYO2pfo5gWJGOAahNC1zUqMX0 =i3Vb -----END PGP SIGNATURE----- Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6 Pull MTD changes from David Woodhouse: - Artem's cleanup of the MTD API continues apace. - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst others. - More work on DiskOnChip G3, new driver for DiskOnChip G4. - Clean up debug/warning printks in JFFS2 to use pr_<level>. Fix up various trivial conflicts, largely due to changes in calling conventions for things like dmaengine_prep_slave_sg() (new inline wrapper to hide new parameter, clashing with rewrite of previously last parameter that used to be an 'append' flag, and is now a bitmap of 'unsigned long flags'). (Also some header file fallout - like so many merges this merge window - and silly conflicts with sparse fixes) * tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits) mtd: docg3 add protection against concurrency mtd: docg3 refactor cascade floors structure mtd: docg3 increase write/erase timeout mtd: docg3 fix inbound calculations mtd: nand: gpmi: fix function annotations mtd: phram: fix section mismatch for phram_setup mtd: unify initialization of erase_info->fail_addr mtd: support ONFI multi lun NAND mtd: sm_ftl: fix typo in major number. mtd: add device-tree support to spear_smi mtd: spear_smi: Remove default partition information from driver mtd: Add device-tree support to fsmc_nand mtd: fix section mismatch for doc_probe_device mtd: nand/fsmc: Remove sparse warnings and errors mtd: nand/fsmc: Add DMA support mtd: nand/fsmc: Access the NAND device word by word whenever possible mtd: nand/fsmc: Use dev_err to report error scenario mtd: nand/fsmc: Use devm routines mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform mtd: fsmc_nand: add pm callbacks to support hibernation ...		13 years ago
..
include/mach	ARM: cleanups of io includes	13 years ago
Kconfig	sh: intc: unify evt2irq/irq2evt macros for sh and arm	13 years ago
Makefile	ARM: shmobile: convert to twd_local_timer_register() interface	13 years ago
Makefile.boot	…
board-ag5evm.c	ARM: cleanups of io includes	13 years ago
board-ap4evb.c	ARM: More SoC support updates	13 years ago
board-bonito.c	ARM: cleanups of io includes	13 years ago
board-g3evm.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
board-g4evm.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
board-kota2.c	ARM: cleanups of io includes	13 years ago
board-mackerel.c	MTD merge for 3.4	13 years ago
board-marzen.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
clock-r8a7740.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
clock-r8a7779.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
clock-sh73a0.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
clock-sh7367.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
clock-sh7372.c	MTD merge for 3.4	13 years ago
clock-sh7377.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
clock.c	ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()	13 years ago
console.c	…
cpuidle.c	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	13 years ago
entry-intc.S	ARM: gic: consolidate PPI handling	13 years ago
headsmp.S	ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT	13 years ago
hotplug.c	ARM: mach-shmobile: Flush caches in platform_cpu_die()	13 years ago
intc-r8a7740.c	ARM: shmobile: remove NR_IRQS	13 years ago
intc-r8a7779.c	ARM: __io abuse cleanup	13 years ago
intc-sh73a0.c	ARM: cleanups of io includes	13 years ago
intc-sh7367.c	ARM: shmobile: remove NR_IRQS	13 years ago
intc-sh7372.c	ARM: shmobile: remove NR_IRQS	13 years ago
intc-sh7377.c	ARM: shmobile: remove NR_IRQS	13 years ago
pfc-r8a7740.c	ARM: mach-shmobile: r8a7740: add PFC support.	13 years ago
pfc-r8a7779.c	ARM: mach-shmobile: r8a7779 PFC IPSR4 fix	13 years ago
pfc-sh73a0.c	ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h	13 years ago
pfc-sh7367.c	ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h	13 years ago
pfc-sh7372.c	ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372	13 years ago
pfc-sh7377.c	ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h	13 years ago
platsmp.c	ARM: shmobile: convert to twd_local_timer_register() interface	13 years ago
pm-r8a7779.c	Disintegrate asm/system.h for ARM	13 years ago
pm-sh7372.c	Disintegrate asm/system.h for ARM	13 years ago
setup-r8a7740.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
setup-r8a7779.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
setup-sh73a0.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
setup-sh7367.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
setup-sh7372.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
setup-sh7377.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
sleep-sh7372.S	PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode	13 years ago
smp-r8a7779.c	ARM: cleanups of io includes	13 years ago
smp-sh73a0.c	ARM: cleanups of io includes	13 years ago
suspend.c	Disintegrate asm/system.h for ARM	13 years ago
timer.c	Merge branch 'renesas/timer' into next/timer	13 years ago