Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 21 Dec 2016 23:32:40 +0000 (01:32 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 21 Dec 2016 23:32:40 +0000 (01:32 +0200)
1  2 
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/mtd/ubi/build.c
drivers/s390/block/dasd.c
drivers/tty/vt/keyboard.c
fs/proc/base.c
fs/ubifs/file.c
fs/ubifs/tnc_commit.c
kernel/sched.c
kernel/trace/trace.c
mm/hugetlb.c
mm/shmem.c

@@@ -957,8 -1030,9 +959,9 @@@ out_uif
        ubi_assert(ref);
        uif_close(ubi);
  out_detach:
+       ubi_devices[ubi_num] = NULL;
        ubi_wl_close(ubi);
 -      free_internal_volumes(ubi);
 +      ubi_free_internal_volumes(ubi);
        vfree(ubi->vtbl);
  out_debugging:
        ubi_debugging_exit_dev(ubi);
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc fs/ubifs/file.c
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/shmem.c
Simple merge