kevin/linux
1
Fork 0
Code
22ae77bc7a
linux/arch/arm
History
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
..
boot arm: allow usage of string functions in linux/string.h 2009-03-31 13:05:36 +10:30
common clkdev: add possibility to get a clock based on the device name 2009-03-27 14:51:13 +01:00
configs arm: update omap_ldp defconfig to use smsc911x 2009-04-02 18:26:26 +01:00
include/asm Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
kernel Simplify copy_thread() 2009-04-02 19:04:51 -07:00
lib
mach-aaec2000 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-at91 [ARM] 5441/1: Use pr_err on error paths in at91 pm 2009-04-01 22:18:19 +01:00
mach-clps711x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-davinci Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
mach-ebsa110 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ep93xx Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-footbridge [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-gemini [ARM] arch_reset() now takes a second parameter 2009-03-30 10:40:12 +01:00
mach-h720x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-imx i.MX1: remove fb support from mach-imx 2009-03-27 14:51:13 +01:00
mach-integrator [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-iop13xx Merge branch 'master' into devel 2009-03-28 20:30:18 +00:00
mach-iop32x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-iop33x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp4xx [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp23xx [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-ixp2000 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-kirkwood Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-ks8695 Merge branch 'highmem' into devel 2009-03-24 22:47:45 +00:00
mach-l7200 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-lh7a40x [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-loki [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-mmp [ARM] arch_reset() now takes a second parameter 2009-03-30 10:40:12 +01:00
mach-msm [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-mv78xx0 Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-mx1 Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
mach-mx2 i.MX21/27: remove ifdef CONFIG_FB_IMX 2009-03-27 14:51:14 +01:00
mach-mx3 arm: convert pcm037 platform to use smsc911x 2009-04-02 18:21:15 +01:00
mach-netx trivial: fix typo "virual" -> "virtual" 2009-03-30 15:21:57 +02:00
mach-ns9xxx Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-omap1 trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
mach-omap2 Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6 2009-04-02 23:22:11 +01:00
mach-orion5x Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-pnx4008 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-pxa Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
mach-realview Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6 2009-04-02 23:22:11 +01:00
mach-rpc [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-s3c24a0/include/mach [ARM] S3C: Make IRQ_EINT sleep control common 2009-03-08 12:35:36 +00:00
mach-s3c2400
mach-s3c2410 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2412 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2440 Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
mach-s3c2442
mach-s3c2443 S3C24XX: Move and update IIS headers 2009-03-05 12:00:59 +00:00
mach-s3c6400 Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel 2009-03-26 22:46:22 +00:00
mach-s3c6410 [ARM] SMDK6410: Declare iodesc table static 2009-02-26 23:21:49 +00:00
mach-sa1100 [ARM] collie: fix two minor formatting nits 2009-03-25 10:15:00 +00:00
mach-shark [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-versatile [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mach-w90x900 [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00:00
mm [ARM] 5439/1: Do not clear bit 10 of DFSR during abort handling on ARMv6 2009-04-01 22:15:57 +01:00
nwfpe
oprofile Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-03-28 14:03:14 -07:00
plat-iop
plat-mxc V4L/DVB (10674): soc-camera: camera host driver for i.MX3x SoCs 2009-03-30 12:42:53 -03:00
plat-omap [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx 2009-03-28 19:35:02 +00:00
plat-orion Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-pxa [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined 2009-03-26 21:30:11 +08:00
plat-s3c Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-s3c24xx Merge branch 'origin' into devel 2009-03-28 20:29:51 +00:00
plat-s3c64xx [ARM] S3C64XX: add AHB_CON and SPCON register address definitions 2009-03-10 16:33:42 +00:00
tools [ARM] update mach-types 2009-03-23 16:12:37 -04:00
vfp [ARM] 5440/1: Fix VFP state corruption due to preemption during VFP exceptions 2009-04-01 22:17:50 +01:00
Kconfig Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 2009-03-26 23:10:11 +00:00
Kconfig-nommu
Kconfig.debug [ARM] 5412/1: XSCALE: add ice dcc support 2009-02-27 20:57:46 +00:00
Makefile Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel 2009-03-26 23:10:11 +00:00