lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
60d9aa758c
linux-kernel-test/arch/arm
History
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
boot ARM: add base support for Marvell Dove SoC 2009-11-27 15:43:06 -05:00
common Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
configs [ARM] pxa/zeus: default configuration for Arcom Zeus SBC. 2009-12-13 21:42:58 +08:00
include/asm elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
kernel genirq: Convert irq_desc.lock to raw_spinlock 2009-12-14 23:55:33 +01:00
lib
mach-aaec2000
mach-at91 atmel-mci: change use of dma slave interface 2009-12-15 08:53:35 -08:00
mach-bcmring Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
mach-clps711x ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-davinci Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
mach-dove ARM: Add Tauros2 L2 cache controller support 2009-11-27 15:43:21 -05:00
mach-ebsa110
mach-ep93xx ARM: 5790/1: ep93xx: add missing newline between file header and code 2009-11-24 10:04:17 +00:00
mach-footbridge ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-gemini
mach-h720x
mach-integrator ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-iop13xx Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four. 2009-12-05 16:58:41 +01:00
mach-ixp23xx ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-ixp2000 ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-kirkwood [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00
mach-ks8695 ARM: dma-mapping: provide dma_to_page() 2009-11-23 12:53:54 +00:00
mach-l7200
mach-lh7a40x ARM: fix lh7a40x build 2009-12-13 19:39:20 +00:00
mach-loki
mach-mmp [ARM] pxa: add apmu clock support in mmp 2009-12-01 09:02:51 +08:00
mach-msm HTC Dream: mmc compilation fixes 2009-12-10 10:14:34 -08:00
mach-mv78xx0
mach-mx1
mach-mx2 mx27: mxt_td60: Add support to SD/MMC 2009-12-02 12:06:14 +01:00
mach-mx3 mx31moboard: fix typo 2009-12-04 13:23:41 +01:00
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
mach-ns9xxx genirq: Convert irq_desc.lock to raw_spinlock 2009-12-14 23:55:33 +01:00
mach-omap1 omap1: LCD_DMA: Use some define rather than a hexadecimal 2009-12-11 16:16:36 -08:00
mach-omap2 mfd: Rename twl4030* driver files to enable re-use 2009-12-13 20:05:51 +01:00
mach-orion5x tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
mach-pnx4008
mach-pxa [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus 2009-12-13 21:42:58 +08:00
mach-realview ARM: RealView: Fix typo in the RealView/PBX Kconfig entry 2009-12-09 13:19:42 +00:00
mach-rpc
mach-s3c24a0/include/mach ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug 2009-12-13 16:33:19 +00:00
mach-s3c2400 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s3c2410 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s3c2412 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s3c2440 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s3c2442 Merge git://git.infradead.org/battery-2.6 2009-12-15 08:59:33 -08:00
mach-s3c2443
mach-s3c6400 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s3c6410 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-s5pc100 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-sa1100 ARM: fix sa1100 build 2009-12-13 19:38:08 +00:00
mach-shark
mach-stmp37xx
mach-stmp378x
mach-u300 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
mach-ux500 ARM: 5832/1: ARM: U8500 Makefile.boot 2009-11-28 10:22:52 +00:00
mach-versatile
mach-w90x900 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2009-12-14 10:22:11 -08:00
mm fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh 2009-12-11 06:44:59 -05:00
nwfpe
oprofile
plat-iop
plat-mxc Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
plat-nomadik ARM: 5833/1: ARM nomadik: enable U8500 for common platform 2009-11-28 10:22:53 +00:00
plat-omap const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
plat-orion
plat-pxa pxa3xx_nand: move pxa3xx_nand.h common into plat directory 2009-12-01 09:02:43 +08:00
plat-s3c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
plat-s3c24xx Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux 2009-12-09 19:45:58 -08:00
plat-s3c64xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
plat-s5pc1xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
plat-samsung ARM: SAMSUNG: Add plat-samsung as starting point for plat-s3c* moves 2009-12-01 01:28:37 +00:00
plat-stmp3xxx
tools [ARM] Update mach-types 2009-11-25 22:17:36 +00:00
vfp ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions 2009-12-13 16:33:19 +00:00
Kconfig ARM: fix sa1100 build 2009-12-13 19:38:08 +00:00
Kconfig-nommu
Kconfig.debug Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel 2009-12-13 16:35:09 +00:00
Makefile Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00