joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity
android_kernel_sony_sdm845/drivers/mtd/maps
History
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Artem Bityutskiy 7bf7e370d5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
  [media] rc: update for bitop name changes
  fs: simplify iget & friends
  fs: pull inode->i_lock up out of writeback_single_inode
  fs: rename inode_lock to inode_hash_lock
  fs: move i_wb_list out from under inode_lock
  fs: move i_sb_list out from under inode_lock
  fs: remove inode_lock from iput_final and prune_icache
  fs: Lock the inode LRU list separately
  fs: factor inode disposal
  fs: protect inode->i_state with inode->i_lock
  lib, arch: add filter argument to show_mem and fix private implementations
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath
  autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
  autofs4 - remove autofs4_lock
  autofs4 - fix d_manage() return on rcu-walk
  autofs4 - fix autofs4_expire_indirect() traversal
  autofs4 - fix dentry leak in autofs4_expire_direct()
  autofs4 - reinstate last used update on access
  vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
  ...

NOTE!

This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.

To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.

In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.
2011-03-25 17:41:20 +02:00
..
amd76xrom.c mtd: amd76xrom: fix oops at boot when resources are not available 2011-03-11 14:19:09 +00:00
autcpu12-nvram.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bcm963xx-flash.c mtd: bcm963xx-flash: try JEDEC probe if CFI fails 2010-12-03 16:25:16 +00:00
bfin-async-flash.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
cdb89712.c [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants 2008-11-13 15:05:03 +00:00
ceiva.c mtd: drop CONFIG_MTD_CONCAT ifdefs 2011-03-11 14:22:40 +00:00
cfi_flagadm.c [MTD] Make init_flagadm function static 2008-12-10 13:01:00 +00:00
ck804xrom.c mtd: maps: Use printf extension %pR for struct resource 2010-12-03 16:29:54 +00:00
dbox2-flash.c [MTD] Make init_dbox2_flash static 2008-12-10 13:01:02 +00:00
dc21285.c Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
dilnetpc.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
dmv182.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
edb7312.c [MTD] Make the init_edb7312nor function static 2008-12-10 13:00:51 +00:00
esb2rom.c mtd: maps: Use printf extension %pR for struct resource 2010-12-03 16:29:54 +00:00
fortunet.c [MTD] Make init_fortunet function static 2008-12-10 13:01:13 +00:00
gpio-addr-flash.c mtd: maps: gpio-addr-flash: fix warnings and make more portable 2010-10-25 01:16:17 +01:00
h720x-flash.c [MTD] Make h720x_mtd_init function static 2008-12-10 13:01:23 +00:00
ichxrom.c mtd: maps: Use printf extension %pR for struct resource 2010-12-03 16:29:54 +00:00
impa7.c [MTD] Make init_impa7 static 2008-12-10 13:01:32 +00:00
integrator-flash.c mtd: drop CONFIG_MTD_CONCAT ifdefs 2011-03-11 14:22:40 +00:00
intel_vr_nor.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx.c mtd: ixp4xx: add support for static flash partitions 2010-08-04 10:57:00 +01:00
ixp2000.c drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
Kconfig mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
l440gx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
latch-addr-flash.c mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
Makefile mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
map_funcs.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mbx860.c [MTD] Make init_mbx function static 2008-12-10 13:01:20 +00:00
netsc520.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
nettel.c [MTD] [MAPS] Fix printk format warning in nettel.c 2009-01-09 14:17:50 +00:00
octagon-5066.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pci.c [MTD] [MAPS] Remove unused variable after ROM API cleanup. 2008-10-14 11:00:51 +01:00
pcmciamtd.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2010-10-30 12:35:11 +01:00
physmap.c mtd: drop CONFIG_MTD_CONCAT ifdefs 2011-03-11 14:22:40 +00:00
physmap_of.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
pismo.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
plat-ram.c Fix spelling of 'platform' in comments and doc 2010-02-05 12:22:34 +01:00
pmcmsp-flash.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pxa2xx-flash.c ARM: pxa: fix pxa2xx-flash section mismatch 2010-11-30 20:14:04 +08:00
rbtx4939-flash.c [MTD] Remove mtd->{suspend,resume} calls from board drivers 2009-05-26 16:45:44 +01:00
rpxlite.c [MTD] Make init_rpxlite function static 2008-12-10 13:00:43 +00:00
sa1100-flash.c mtd: drop CONFIG_MTD_CONCAT ifdefs 2011-03-11 14:22:40 +00:00
sbc_gxx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sc520cdp.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
scb2_flash.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
scx200_docflash.c mtd: maps: Use printf extension %pR for struct resource 2010-12-03 16:29:54 +00:00
solutionengine.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sun_uflash.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
tqm8xxl.c mtd: remove unnecessary casts of void ptr returning alloc function return values 2010-12-03 16:29:22 +00:00
ts5500_flash.c mtd: ts5500_flash: avoid calling map_destroy on NULL 2011-03-11 14:22:44 +00:00
tsunami_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
uclinux.c mtd/maps: uclinux: fix building when partition support is disabled 2009-09-19 11:44:51 -07:00
vmax301.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
vmu-flash.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wr_sbc82xx_flash.c [MTD] Make init_sbc82xx_flash function static 2008-12-10 13:00:47 +00:00