aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-07 17:10:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-07 17:10:06 -0700
commit3975d16760d4be7402d1067c548c30c427971331 (patch)
tree4fa12ee1e8aabf1352307455163dabe293ed4874 /init/main.c
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parentjffs2: update ctime when changing the file's permission by setfacl (diff)
downloadlinux-dev-3975d16760d4be7402d1067c548c30c427971331.tar.xz
linux-dev-3975d16760d4be7402d1067c548c30c427971331.zip
Merge git://git.infradead.org/~dwmw2/mtd-2.6.35
* git://git.infradead.org/~dwmw2/mtd-2.6.35: jffs2: update ctime when changing the file's permission by setfacl jffs2: Fix NFS race by using insert_inode_locked() jffs2: Fix in-core inode leaks on error paths mtd: Fix NAND submenu mtd/r852: update card detect early. mtd/r852: Fixes in case of DMA timeout mtd/r852: register IRQ as last step drivers/mtd: Use memdup_user docbook: make mtd nand module init static
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions