OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
673fae90d5
linux/arch/arm
History
Linus Torvalds 05ec7dd8dd Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (154 commits)
  mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
  mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
  mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
  mtd: update gfp/slab.h includes
  jffs2: Stop triggering block erases from jffs2_write_super()
  jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
  jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
  jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
  jffs2: Wake GC thread when there are blocks to be erased
  jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
  jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
  mtd: mtdchar: Do not corrupt backing device of device node inode
  mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
  drivers/mtd: Use kmemdup
  mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
  mtd: nand: add Toshiba TC58NVG0 device ID
  pcmciamtd: add another ID
  pcmciamtd: coding style cleanups
  pcmciamtd: fixing obvious errors
  mtd: chips: add SST39WF160x NOR-flashes
  ...

Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
2010-05-21 07:25:43 -07:00
..
boot Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
common Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
configs Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
include/asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-05-20 09:20:59 -07:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-05-19 11:37:22 -07:00
lib
mach-aaec2000
mach-at91 ARM: remove 'select GENERIC_TIME' 2010-05-18 08:17:56 +01:00
mach-bcmring Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-clps711x ARM: Remove useless linux/bootmem.h includes 2010-05-15 15:03:48 +01:00
mach-cns3xxx
mach-davinci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-05-20 09:41:44 -07:00
mach-dove
mach-ebsa110
mach-ep93xx Merge git://git.infradead.org/mtd-2.6 2010-05-21 07:25:43 -07:00
mach-footbridge
mach-gemini
mach-h720x
mach-integrator Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-iop13xx
mach-iop32x Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-iop33x
mach-ixp4xx Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge git://git.infradead.org/mtd-2.6 2010-05-21 07:25:43 -07:00
mach-ks8695
mach-l7200
mach-lh7a40x
mach-loki
mach-mmp [ARM] mmp: append device support in jasper 2010-05-11 17:25:06 +02:00
mach-msm msm: 7x30 Kconfig and makefile changes 2010-05-13 16:08:55 -07:00
mach-mv78xx0
mach-mx1
mach-mx2 can: sja1000 platform data fixes 2010-05-17 22:39:48 -07:00
mach-mx3 can: sja1000 platform data fixes 2010-05-17 22:39:48 -07:00
mach-mx5
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1 Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-omap2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
mach-orion5x
mach-pnx4008
mach-pxa Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
mach-realview Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration 2010-05-19 18:25:30 +09:00
mach-s3c2400
mach-s3c2410 ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
mach-s3c2412 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-05-20 09:41:44 -07:00
mach-s3c2416 ARM: SMDK2416: Add support for framebuffer device and ensure correct setup 2010-05-18 18:46:30 +09:00
mach-s3c2440 ARM: Merge for-2635/gpio2 2010-05-19 18:04:08 +09:00
mach-s3c2443 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-05-20 09:20:59 -07:00
mach-s5p6440 ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories 2010-05-19 18:16:04 +09:00
mach-s5p6442 ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories 2010-05-19 18:16:04 +09:00
mach-s5pc100 ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 2010-05-19 18:23:37 +09:00
mach-s5pv210 ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories 2010-05-19 18:16:04 +09:00
mach-sa1100
mach-shark
mach-shmobile ARM: remove 'select GENERIC_TIME' 2010-05-18 08:17:56 +01:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-u300 Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-ux500
mach-versatile Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
mach-vexpress
mach-w90x900
mm Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux 2010-05-19 11:49:33 -07:00
nwfpe Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
oprofile ARM: 6074/1: oprofile: convert from sysdev to platform device 2010-05-17 11:53:59 +01:00
plat-iop
plat-mxc
plat-nomadik Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
plat-omap Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-05-20 21:26:12 -07:00
plat-orion mtd: orion/kirkwood: add RnB line support to orion mtd driver 2010-05-14 01:04:19 +01:00
plat-pxa Merge branch 'devel-stable' into devel 2010-05-17 17:24:04 +01:00
plat-s3c24xx ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
plat-s5p ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move 2010-05-19 18:22:47 +09:00
plat-s5pc1xx ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 2010-05-19 18:23:37 +09:00
plat-samsung Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-05-20 09:41:44 -07:00
plat-spear
plat-stmp3xxx
plat-versatile
tools
vfp
Kconfig Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-05-19 12:08:50 -07:00
Kconfig-nommu
Kconfig.debug
Makefile Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux 2010-05-19 11:49:33 -07:00