diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-11 11:29:44 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-11 11:29:44 +0530 |
commit | e6dca42c2c2ad0f06c6704c73a03e5516dc14b13 (patch) | |
tree | 6ce2385fd736a6fc9a02ace4f5f139a6c8cfbaaf /security | |
parent | 462ba8b0bca7e376722158f1f1a094ba1c0bd1ad (diff) | |
parent | 1f5547c7f183363eabe07e5d202a49f2e94e995a (diff) |
Merge commit 'v3.4.2' into android-tegra-nv-3.4
Conflicts:
drivers/i2c/busses/i2c-tegra.c
drivers/usb/gadget/fsl_udc_core.c
Change-Id: Ibfc3a8edc3665b832ddc94f89fc17b556629d104
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/selinuxfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index d7018bfa1f00..3068d16cf128 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -1232,6 +1232,7 @@ static int sel_make_bools(void) kfree(bool_pending_names[i]); kfree(bool_pending_names); kfree(bool_pending_values); + bool_num = 0; bool_pending_names = NULL; bool_pending_values = NULL; |